@manyducks.co/dolla 0.75.0 → 0.76.0

package/lib/index.js

@@ -1070,16 +1070,21 @@ var HTML = class {
     const propStopCallbacks = [];
     if (styles == void 0) {
       element.style.cssText = "";
+    } else if (typeof styles === "string") {
+      element.style.cssText = styles;
     } else if (isReadable(styles)) {
       let unapply;
       const stop = observe(styles, (current) => {
-        render.update(() => {
-          if (isFunction(unapply)) {
-            unapply();
-          }
-          element.style.cssText = "";
-          unapply = this.applyStyles(element, current, stopCallbacks);
-        }, this.getUpdateKey("styles", "*"));
+        render.update(
+          () => {
+            if (isFunction(unapply)) {
+              unapply();
+            }
+            element.style.cssText = "";
+            unapply = this.applyStyles(element, current, stopCallbacks);
+          },
+          this.getUpdateKey("styles", "*")
+        );
       });
       stopCallbacks.push(stop);
       propStopCallbacks.push(stop);
@@ -1090,13 +1095,16 @@ var HTML = class {
         const setProperty = key.startsWith("--") ? (key2, value2) => value2 == null ? element.style.removeProperty(key2) : element.style.setProperty(key2, value2) : (key2, value2) => element.style[key2] = value2 ?? "";
         if (isReadable(value)) {
           const stop = observe(value, (current) => {
-            render.update(() => {
-              if (current != null) {
-                setProperty(key, current);
-              } else {
-                element.style.removeProperty(key);
-              }
-            }, this.getUpdateKey("style", key));
+            render.update(
+              () => {
+                if (current != null) {
+                  setProperty(key, current);
+                } else {
+                  element.style.removeProperty(key);
+                }
+              },
+              this.getUpdateKey("style", key)
+            );
           });
           stopCallbacks.push(stop);
           propStopCallbacks.push(stop);
@@ -1124,13 +1132,16 @@ var HTML = class {
     if (isReadable(classes)) {
       let unapply;
       const stop = observe(classes, (current) => {
-        render.update(() => {
-          if (isFunction(unapply)) {
-            unapply();
-          }
-          element.removeAttribute("class");
-          unapply = this.applyClasses(element, current, stopCallbacks);
-        }, this.getUpdateKey("attr", "class"));
+        render.update(
+          () => {
+            if (isFunction(unapply)) {
+              unapply();
+            }
+            element.removeAttribute("class");
+            unapply = this.applyClasses(element, current, stopCallbacks);
+          },
+          this.getUpdateKey("attr", "class")
+        );
       });
       stopCallbacks.push(stop);
       classStopCallbacks.push(stop);
@@ -2984,6 +2995,9 @@ function resolvePath(base, part) {
 function parseQueryParams(query) {
   if (!query)
     return {};
+  if (query.startsWith("?")) {
+    query = query.slice(1);
+  }
   const entries = query.split("&").filter((x) => x.trim() !== "").map((entry) => {
     const [key, value] = entry.split("=").map((x) => x.trim());
     if (value.toLowerCase() === "true") {
@@ -3241,21 +3255,19 @@ function RouterStore(ctx) {
   const $$pattern = $$(null);
   const $$path = $$("");
   const $$params = $$({});
-  const $$query = $$({});
-  let isRouteChange = true;
+  const $$query = $$(parseQueryParams(window.location.search));
   ctx.observe($$query, (current) => {
-    if (isRouteChange) {
-      isRouteChange = false;
-      return;
-    }
     const params = new URLSearchParams();
     for (const key in current) {
       params.set(key, String(current[key]));
     }
-    history.replace({
-      pathname: history.location.pathname,
-      search: "?" + params.toString()
-    });
+    const search = "?" + params.toString();
+    if (search != history.location.search) {
+      history.replace({
+        pathname: history.location.pathname,
+        search
+      });
+    }
   });
   ctx.onConnected(() => {
     history.listen(onRouteChange);
@@ -3275,8 +3287,7 @@ function RouterStore(ctx) {
   const onRouteChange = async ({ location }) => {
     if (location.search !== lastQuery) {
       lastQuery = location.search;
-      isRouteChange = true;
-      $$query.set(parseQueryParams(location.search.startsWith("?") ? location.search.slice(1) : location.search));
+      $$query.set(parseQueryParams(location.search));
     }
     const matched = matchRoutes(routes, location.pathname);
     if (!matched) {
@@ -3388,6 +3399,9 @@ function RouterStore(ctx) {
       joined = path.toString();
     }
     joined = resolvePath(history.location.pathname, joined);
+    if (options.preserveQuery) {
+      joined += history.location.search;
+    }
     if (options.replace) {
       history.replace(joined);
     } else {