@cocreate/state 1.22.0 → 1.22.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.22.1](https://github.com/CoCreate-app/CoCreate-state/compare/v1.22.0...v1.22.1) (2024-04-29)
+
+
+### Bug Fixes
+
+* bump cocreate dependencies ([3972fe5](https://github.com/CoCreate-app/CoCreate-state/commit/3972fe5147f4e95b04df3188c3520ead5fd40a95))
+* state management ([13177bd](https://github.com/CoCreate-app/CoCreate-state/commit/13177bdf44ff2d3248e6ccce1b2c74222727d0c6))
+
 # [1.22.0](https://github.com/CoCreate-app/CoCreate-state/compare/v1.21.0...v1.22.0) (2024-04-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/state",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "description": "Data attributes which can be used for components in CoCreate framework combined as a group of attributes that dynamically change attributes & fetch custom data.",
   "keywords": [
     "state",
@@ -58,11 +58,11 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.14.0",
-    "@cocreate/crud-client": "^1.31.0",
-    "@cocreate/element-prototype": "^1.15.0",
-    "@cocreate/local-storage": "^1.12.0",
-    "@cocreate/observer": "^1.14.0",
-    "@cocreate/uuid": "^1.9.0"
+    "@cocreate/actions": "^1.18.1",
+    "@cocreate/crud-client": "^1.33.8",
+    "@cocreate/element-prototype": "^1.22.2",
+    "@cocreate/local-storage": "^1.14.3",
+    "@cocreate/observer": "^1.16.0",
+    "@cocreate/uuid": "^1.11.1"
   }
 }

package/src/index.js

@@ -55,25 +55,17 @@ function _setAttributeValues(el, attrValues) {
     delete attrValues['overwrite']
 
     for (const key of Object.keys(attrValues)) {
-        if (attrValues[key] === '$back') {
-            window.history.back();
-            break;
-        } else if (attrValues[key] === '$forward') {
-            window.history.forward();
-            break;
-        } else {
-            _setAttributeValue(el, key, attrValues[key], isOverwrite);
-            _setAttributeValue(el, `state-${key}`, attrValues[key], isOverwrite);
-            if (key == 'array' || key == 'object' || key == 'name') {
-                _setAttributeValue(el, `fetch-${key}`, attrValues[key], isOverwrite);
-                _setAttributeValue(el, `state-fetch-${key}`, attrValues[key], isOverwrite);
-            }
-            if (key == 'template') {
-                _setAttributeValue(el, 'template_id', attrValues[key], isOverwrite);
-            }
-            if (key == 'template_id') {
-                _setAttributeValue(el, 'template', attrValues[key], isOverwrite);
-            }
+        _setAttributeValue(el, key, attrValues[key], isOverwrite);
+        _setAttributeValue(el, `state-${key}`, attrValues[key], isOverwrite);
+        if (key == 'array' || key == 'object' || key == 'name') {
+            _setAttributeValue(el, `fetch-${key}`, attrValues[key], isOverwrite);
+            _setAttributeValue(el, `state-fetch-${key}`, attrValues[key], isOverwrite);
+        }
+        if (key == 'template') {
+            _setAttributeValue(el, 'template_id', attrValues[key], isOverwrite);
+        }
+        if (key == 'template_id') {
+            _setAttributeValue(el, 'template', attrValues[key], isOverwrite);
         }
     }
 }
@@ -105,26 +97,33 @@ async function stateAttributes(element) {
         elements.push(...nestedElements)
     }
 
-    let pushState = true
+    let changeState = false
     for (let i = 0; i < elements.length; i++) {
         let attrValues = await _getAttributeValues(elements[i]);
-        if (attrValues.src === '$back' || attrValues.src === '$forward')
-            pushState = false
+        if (attrValues.src === '$back' || attrValues.href === '$back') {
+            changeState = true
+            window.history.back();
+            break;
+        } else if (attrValues.src === '$forward' || attrValues.href === '$forward') {
+            changeState = true
+            window.history.forward();
+            break;
+        }
+
         let state_to = elements[i].getAttribute('state_to');
         Object.assign(statedAttributes, { [`${state_to}`]: attrValues });
         _getStateId(attrValues, state_to);
     }
     statedAttributes = JSON.stringify(statedAttributes)
-    if (pushState && !element.closest('href')) {
+    let href = element.closest('href')
+    if (!changeState && !href) {
         // TODO: Handle $title when adding statedAttributes
         let title = element.getAttribute('title') || document.title || '';
-
         history.pushState({ statedAttributes, title, url: location.href }, title, location.href);
-    } else {
-        console.log('pushState: ', pushState)
     }
 
-    localStorage.setItem('statedAttributes', statedAttributes);
+    if (!changeState)
+        localStorage.setItem('statedAttributes', statedAttributes);
 
     document.dispatchEvent(new CustomEvent('stateEnd', {
         detail: {}
@@ -158,9 +157,12 @@ function _getStateId(attrValues, state_to) {
 }
 
 window.onload = function () {
-    if (!history.state || history.state.url !== location.href) {
+    if (!history.length) {
         const statedAttributes = localStorage.getItem('statedAttributes') || '';
         history.replaceState({ statedAttributes, url: location.href, title: document.title }, document.title, location.href);
+    } else if (!history.state || history.state.url !== location.href) {
+        const statedAttributes = localStorage.getItem('statedAttributes') || '';
+        history.pushState({ statedAttributes, url: location.href, title: document.title }, document.title, location.href);
     }
 };