@datawheel/bespoke 0.5.3 → 0.5.5

package/dist/index.js

@@ -4984,9 +4984,9 @@ function Stat({
       }
     ),
     /* @__PURE__ */ jsxs(Stack, { spacing: 0, children: [
-      /* @__PURE__ */ jsx(RichText, { component: "div", size: "md", html: title, style: settings }),
-      /* @__PURE__ */ jsx(RichText, { component: "div", size: "xl", html: value, style: settings }),
-      /* @__PURE__ */ jsx(RichText, { component: "div", size: "sm", html: subtitle, style: settings })
+      title && /* @__PURE__ */ jsx(RichText, { component: "div", size: "md", html: title, style: settings }),
+      value && /* @__PURE__ */ jsx(RichText, { component: "div", size: "xl", html: value, style: settings }),
+      subtitle && /* @__PURE__ */ jsx(RichText, { component: "div", size: "sm", html: subtitle, style: settings })
     ] }, "stat"),
     tooltip && /* @__PURE__ */ jsx(InnerTooltip, { content: tooltip })
   ] });
@@ -12666,6 +12666,63 @@ var init_UnlocalizedFieldLabel = __esm({
     UnlocalizedFieldLabel_default = UnlocalizedFieldLabel;
   }
 });
+
+// components/blocks/types/selector.ts
+var SELECTOR_TYPE, SELECTOR_COMPONENT, OPTION_TYPE, isValidSelectorOptionsArray, isPrimitiveTypeVariable, isValidSelectorState, deriveLogicOptions;
+var init_selector = __esm({
+  "components/blocks/types/selector.ts"() {
+    init_esm_shims();
+    SELECTOR_TYPE = {
+      SINGLE: "single",
+      MULTI: "multi"
+    };
+    SELECTOR_COMPONENT = {
+      SEGMENTED_CONTROL: "segmented control",
+      SELECTOR: "selector"
+    };
+    OPTION_TYPE = {
+      STATIC: "static",
+      DYNAMIC: "dynamic"
+    };
+    isValidSelectorOptionsArray = (variable) => variable && Array.isArray(variable) && variable.length > 0;
+    isPrimitiveTypeVariable = (variable) => isValidSelectorOptionsArray(variable) && ["string"].includes(typeof variable[0]);
+    isValidSelectorState = (simpleState) => {
+      const {
+        name,
+        type,
+        optionsType,
+        options
+      } = simpleState;
+      if (![name, type, optionsType, options].every(Boolean))
+        return false;
+      if (optionsType === OPTION_TYPE.STATIC)
+        return options.static?.length > 0 && options.static?.every((o2) => o2.id);
+      if (!options.dynamic?.isPrimitiveType)
+        return !!options.dynamic?.idKey;
+      return true;
+    };
+    deriveLogicOptions = (selectorType, options, optionsType) => {
+      let defaultValue;
+      let logicOptions;
+      if (optionsType === OPTION_TYPE.STATIC) {
+        defaultValue = selectorType === SELECTOR_TYPE.SINGLE ? options.static.find((o2) => o2.isDefault)?.id : options.static.filter((o2) => o2.isDefault).map((o2) => o2.id);
+        logicOptions = options.static.map(({ id, label }) => ({ id, label: label || id }));
+      } else {
+        const {
+          optionsVar,
+          idKey,
+          labelKey,
+          defaultVar,
+          isPrimitiveType
+        } = options.dynamic;
+        if (defaultVar)
+          defaultValue = `variables["${defaultVar}"]`;
+        logicOptions = isPrimitiveType ? `variables["${optionsVar}"]` : `(variables["${optionsVar}"] || []).map(d => ({id: String(d["${idKey}"]), label: String(d["${labelKey || idKey}"])}))`;
+      }
+      return { logicOptions, defaultValue };
+    };
+  }
+});
 function StaticSelectorOptionRow({ option, editOption, deleteOption }) {
   return /* @__PURE__ */ jsxs("tr", { className: "reports-selector-static-option", children: [
     /* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx(
@@ -12904,23 +12961,7 @@ function SelectorUI(props) {
         component: selectorComponent,
         type: selectorType
       };
-      let defaultValue;
-      let logicOptions;
-      if (optionsType === OPTION_TYPE.STATIC) {
-        defaultValue = selectorType === SELECTOR_TYPE.SINGLE ? options.static.find((o2) => o2.isDefault)?.id : options.static.filter((o2) => o2.isDefault).map((o2) => o2.id);
-        logicOptions = options.static.map(({ id: id2, label }) => ({ id: id2, label: label || id2 }));
-      } else {
-        const {
-          optionsVar,
-          idKey,
-          labelKey,
-          defaultVar,
-          isPrimitiveType
-        } = options.dynamic;
-        if (defaultVar)
-          defaultValue = `variables["${defaultVar}"]`;
-        logicOptions = isPrimitiveType ? `variables["${optionsVar}"]` : `(variables["${optionsVar}"] || []).map(d => ({id: String(d["${idKey}"]), label: String(d["${labelKey || idKey}"])}))`;
-      }
+      const { logicOptions, defaultValue } = deriveLogicOptions(selectorType, options, optionsType);
       if (defaultValue)
         logicObj.defaultValue = defaultValue;
       logicObj.options = logicOptions;
@@ -13009,7 +13050,7 @@ function SelectorUI(props) {
     executeButton
   ] });
 }
-var SELECTOR_TYPE, SELECTOR_COMPONENT, OPTION_TYPE, isValidSelectorOptionsArray, isPrimitiveTypeVariable, isValidSelectorState, SelectorUI_default;
+var SelectorUI_default;
 var init_SelectorUI = __esm({
   "components/blocks/types/simpleEditors/SelectorUI.tsx"() {
     init_esm_shims();
@@ -13019,35 +13060,7 @@ var init_SelectorUI = __esm({
     init_RichTextEditor();
     init_UnlocalizedFieldLabel();
     init_cms();
-    SELECTOR_TYPE = {
-      SINGLE: "single",
-      MULTI: "multi"
-    };
-    SELECTOR_COMPONENT = {
-      SEGMENTED_CONTROL: "segmented control",
-      SELECTOR: "selector"
-    };
-    OPTION_TYPE = {
-      STATIC: "static",
-      DYNAMIC: "dynamic"
-    };
-    isValidSelectorOptionsArray = (variable) => variable && Array.isArray(variable) && variable.length > 0;
-    isPrimitiveTypeVariable = (variable) => isValidSelectorOptionsArray(variable) && ["string"].includes(typeof variable[0]);
-    isValidSelectorState = (simpleState) => {
-      const {
-        name,
-        type,
-        optionsType,
-        options
-      } = simpleState;
-      if (![name, type, optionsType, options].every(Boolean))
-        return false;
-      if (optionsType === OPTION_TYPE.STATIC)
-        return options.static?.length > 0 && options.static?.every((o2) => o2.id);
-      if (!options.dynamic?.isPrimitiveType)
-        return !!options.dynamic?.idKey;
-      return true;
-    };
+    init_selector();
     SelectorUI_default = SelectorUI;
   }
 });
@@ -21019,6 +21032,7 @@ var scaffoldEmptyBlock = (block) => {
 // components/blocks/Block.tsx
 init_stringifyObject();
 init_BlockEditorProvider();
+init_selector();
 var UNLOCALIZED_ICON_KEYS = [
   "_iconVariant",
   "_iconSize",
@@ -21144,7 +21158,11 @@ function Block2({ id, modified, callbacks, inline }) {
         });
         const logicObj = { ...newSimple };
         if (block.type === BLOCK_TYPES.SELECTOR) {
-          logicObj.options = logicObj.options[logicObj.optionsType];
+          const { selectorType, options, optionsType } = contentByLocale[currentLocale2].content.simple;
+          const { logicOptions, defaultValue } = deriveLogicOptions(selectorType, options, optionsType);
+          if (defaultValue)
+            logicObj.defaultValue = defaultValue;
+          logicObj.options = logicOptions;
         }
         newContentByLocale[locale].content = {
           ...newContentByLocale[locale].content,
@@ -21160,10 +21178,11 @@ function Block2({ id, modified, callbacks, inline }) {
     const { settings } = blockState;
     const contentByLocale = Object.values(blockState.contentByLocale).reduce(reduceContent, {});
     const properties = ["id", "api", "shared", "type"].reduce((acc, d2) => ({ ...acc, [d2]: blockState[d2] }), {});
+    const newContent = spreadUnlocalizedContent(contentByLocale, currentLocale);
     return {
       ...properties,
       id: blockState.id,
-      contentByLocale: spreadUnlocalizedContent(contentByLocale, currentLocale),
+      contentByLocale: newContent,
       settings
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -141,4 +141,4 @@
   "peerDependencies": {
     "next": "^14.2.3"
   }
-}
+}