@datawheel/bespoke 0.4.1 → 0.4.2

package/dist/index.js

@@ -1104,7 +1104,7 @@ var init_valueInOptions = __esm({
 });
 
 // libs/selectors/runSelector.js
-function runSelector(id, logic, formatterFunctions, blockContext, router = void 0) {
+function runSelector(id, logic, formatterFunctions, blockContext, replaceQuery = false) {
   const { variables } = parseBlockContext(blockContext);
   const transpiledLogic = varSwapRecursive_default({ logic }, formatterFunctions, blockContext).logic;
   const evalResult = mortarEval_default("variables", variables, transpiledLogic, formatterFunctions, void 0, blockContext);
@@ -1126,14 +1126,14 @@ function runSelector(id, logic, formatterFunctions, blockContext, router = void
     const fallbackValue = options && options[0] && options[0].id || options[0] || "";
     defaultValue = maybeFixForMulti2(fallbackValue);
   }
-  if (router) {
+  if (replaceQuery) {
     const accesor = `selector${id}id`;
-    const { query, pathname } = router;
+    const searchParams = new URLSearchParams(window.location.search);
+    const query = Object.fromEntries(searchParams);
     const currentValue = query[accesor];
-    if (currentValue && !valueInOptions_default(type, currentValue, options)) {
-      const newQuery = { ...query };
-      delete newQuery[accesor];
-      router.replace({ pathname, query: newQuery }, void 0, { shallow: true });
+    if (currentValue && !valueInOptions_default(type, currentValue, options) && currentValue !== void 0) {
+      searchParams.delete(accesor);
+      window.history.replaceState(null, null, `?${searchParams.toString()}`);
     }
   }
   const config = {
@@ -1175,7 +1175,7 @@ var init_selectorQueryToVariable = __esm({
           [`selector${id}label`]: (options || []).map((d) => d.label)
         };
       }
-      const queryId = queryObject.get(accessor) ? queryObject.get(accessor) : config.defaultValue;
+      const queryId = queryObject.get(accessor) && config.options.find((d) => d.id === queryObject.get(accessor)) ? queryObject.get(accessor) : config.defaultValue;
       const option = config.options.find((d) => d.id === queryId);
       return {
         [`selector${id}id`]: queryId,
@@ -1361,7 +1361,7 @@ function BlockException(message) {
   this.name = "BlockException";
   this.message = message;
 }
-async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn, router = void 0) {
+async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn) {
   const { locale, variables, query } = parseBlockContext(blockContext);
   const allowed = isBlockAllowed(block, blockContext, variables, formatterFunctions);
   let resp = null;
@@ -1426,7 +1426,7 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
       block.contentByLocale[locale].content.logic,
       formatterFunctions,
       blockContext,
-      router
+      true
     );
     return {
       outputVariables: selectorQueryToVariable_default(block.id, query, config),
@@ -1646,7 +1646,7 @@ var init_runConsumers = __esm({
       }
       return allowed;
     };
-    runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section", router = void 0) => {
+    runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section") => {
       if (!bid && !sections)
         return { ...initialState4 };
       const variablesById = { ...initialState4.variables ?? {} };
@@ -1713,8 +1713,7 @@ var init_runConsumers = __esm({
                 variables,
                 locale: variables.locale
               },
-              readMemberFn,
-              router
+              readMemberFn
             ).then(({ outputVariables, status }) => {
               if (status.error) {
                 if (typeof window === "undefined") {
@@ -4301,7 +4300,9 @@ function useOnChangeSelector(blockId, section, selectorIdentifier, asComparison
         query: { ...querySelectors, [selectorIdentifier]: value },
         variables
       };
-      router.replace({ query: { ...query, [selectorIdentifierParams]: value } }, void 0, { shallow: true });
+      const searchParams = new URLSearchParams(window.location.search);
+      searchParams.set(selectorIdentifierParams, value);
+      window.history.replaceState(null, null, `?${searchParams.toString()}`);
       runConsumersV2(
         blockRecords,
         void 0,
@@ -4313,8 +4314,7 @@ function useOnChangeSelector(blockId, section, selectorIdentifier, asComparison
           status: initialStatus
         },
         readMemberFn,
-        "report",
-        router
+        "report"
       ).then((data) => {
         if (comparison.active && asComparison) {
           comparison.setComparisonVariables({

package/dist/server.js

@@ -4633,7 +4633,7 @@ var valueInOptions_default = (type, value, options) => {
 };
 
 // libs/selectors/runSelector.js
-function runSelector(id, logic, formatterFunctions, blockContext, router = void 0) {
+function runSelector(id, logic, formatterFunctions, blockContext, replaceQuery = false) {
   const { variables } = parseBlockContext(blockContext);
   const transpiledLogic = varSwapRecursive_default({ logic }, formatterFunctions, blockContext).logic;
   const evalResult = mortarEval_default("variables", variables, transpiledLogic, formatterFunctions, void 0, blockContext);
@@ -4655,14 +4655,14 @@ function runSelector(id, logic, formatterFunctions, blockContext, router = void
     const fallbackValue = options && options[0] && options[0].id || options[0] || "";
     defaultValue = maybeFixForMulti(fallbackValue);
   }
-  if (router) {
+  if (replaceQuery) {
     const accesor = `selector${id}id`;
-    const { query, pathname } = router;
+    const searchParams = new URLSearchParams(window.location.search);
+    const query = Object.fromEntries(searchParams);
     const currentValue = query[accesor];
-    if (currentValue && !valueInOptions_default(type, currentValue, options)) {
-      const newQuery = { ...query };
-      delete newQuery[accesor];
-      router.replace({ pathname, query: newQuery }, void 0, { shallow: true });
+    if (currentValue && !valueInOptions_default(type, currentValue, options) && currentValue !== void 0) {
+      searchParams.delete(accesor);
+      window.history.replaceState(null, null, `?${searchParams.toString()}`);
     }
   }
   const config = {
@@ -4688,7 +4688,7 @@ var selectorQueryToVariable = (id, query, config) => {
       [`selector${id}label`]: (options || []).map((d) => d.label)
     };
   }
-  const queryId = queryObject.get(accessor) ? queryObject.get(accessor) : config.defaultValue;
+  const queryId = queryObject.get(accessor) && config.options.find((d) => d.id === queryObject.get(accessor)) ? queryObject.get(accessor) : config.defaultValue;
   const option = config.options.find((d) => d.id === queryId);
   return {
     [`selector${id}id`]: queryId,
@@ -4848,7 +4848,7 @@ function BlockException(message) {
   this.name = "BlockException";
   this.message = message;
 }
-async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn, router = void 0) {
+async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn) {
   const { locale, variables, query } = parseBlockContext(blockContext);
   const allowed = isBlockAllowed(block, blockContext, variables, formatterFunctions);
   let resp = null;
@@ -4913,7 +4913,7 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
       block.contentByLocale[locale].content.logic,
       formatterFunctions,
       blockContext,
-      router
+      true
     );
     return {
       outputVariables: selectorQueryToVariable_default(block.id, query, config),
@@ -5091,7 +5091,7 @@ var isBlockAllowed = (block, blockContext, variables, formatterFunctions) => {
   }
   return allowed;
 };
-var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section", router = void 0) => {
+var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section") => {
   if (!bid && !sections)
     return { ...initialState4 };
   const variablesById = { ...initialState4.variables ?? {} };
@@ -5158,8 +5158,7 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
             variables,
             locale: variables.locale
           },
-          readMemberFn,
-          router
+          readMemberFn
         ).then(({ outputVariables, status }) => {
           if (status.error) {
             if (typeof window === "undefined") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {