data, content, css: FlashAct.{shortName,title,titleColor}

1 files changed, 39 insertions, 4 deletions

diff --git a/src/data/things/flash/FlashAct.js b/src/data/things/flash/FlashAct.js
index d1c64b4b..19412fdc 100644
--- a/src/data/things/flash/FlashAct.js
+++ b/src/data/things/flash/FlashAct.js
@@ -1,6 +1,6 @@
 import {input, V} from '#composite';
 import Thing from '#thing';
-import {isContentString, isString} from '#validators';
+import {isColor, isContentString, isString} from '#validators';
 
 import {withPropertyFromObject} from '#composite/data';
 
@@ -33,10 +33,42 @@ export class FlashAct extends Thing {
     side: thing(V(FlashSide)),
 
     name: name(V('Unnamed Flash Act')),
-    nameHTML: simpleString(),
-    directory: directory(),
+
+    title: simpleString(),
+
+    shortName: [
+      exposeUpdateValueOrContinue({
+        validate: input.value(isString),
+      }),
+
+      exposeDependency('name'),
+    ],
+
+    directory: [
+      {
+        dependencies: ['name', 'shortName'],
+        compute: (continuation, {name, shortName}) =>
+          continuation({
+            ['#name']:
+              shortName ?? name,
+          }),
+      },
+
+      directory('#name'),
+    ],
+
     color: color(),
 
+    titleColor: [
+      exitWithoutDependency('title'),
+
+      exposeUpdateValueOrContinue({
+        validate: input.value(isColor),
+      }),
+
+      exposeDependency('color'),
+    ],
+
     listTerminology: [
       exposeUpdateValueOrContinue({
         validate: input.value(isContentString),
@@ -77,10 +109,13 @@ export class FlashAct extends Thing {
   static [Thing.yamlDocumentSpec] = {
     fields: {
       'Act': {property: 'name'},
-      'Act HTML': {property: 'nameHTML'},
+      'Title': {property: 'title'},
+      'Short': {property: 'shortName'},
       'Directory': {property: 'directory'},
 
       'Color': {property: 'color'},
+      'Title Color': {property: 'titleColor'},
+
       'List Terminology': {property: 'listTerminology'},
 
       'Review Points': {ignore: true},