smbls 2.11.451 → 2.11.452

package/dist/cjs/index.js

@@ -9777,11 +9777,11 @@ __export(init_exports, {
   DYNAMIC_JSON: () => import_dynamic.default,
   applyCSS: () => applyCSS,
   init: () => init,
-  reInit: () => reInit,
+  reinit: () => reinit,
   setClass: () => setClass,
   updateVars: () => updateVars
 });
-var import_scratch, import_utils2, import_dynamic, CONFIG, mergeWithLocalFile, SET_OPTIONS, init, UPDATE_OPTIONS, reInit, applyCSS, updateVars, setClass;
+var import_scratch, import_utils2, import_dynamic, CONFIG, mergeWithLocalFile, SET_OPTIONS, init, UPDATE_OPTIONS, reinit, applyCSS, updateVars, setClass;
 var init_init = __esm({
   "../init/index.js"() {
     "use strict";
@@ -9790,8 +9790,8 @@ var init_init = __esm({
     init_emotion();
     import_dynamic = __toESM(require_dynamic());
     CONFIG = (0, import_scratch.getActiveConfig)();
-    mergeWithLocalFile = (config = CONFIG, RC_FILE) => {
-      const rcfile = (0, import_utils2.isObject)(RC_FILE) ? RC_FILE : import_dynamic.default || {};
+    mergeWithLocalFile = (config = CONFIG, options) => {
+      const rcfile = (0, import_utils2.isObject)(options.localFile) ? options.localFile : import_dynamic.default || {};
       const clonedFile = (0, import_utils2.deepClone)(rcfile.designSystem || {});
       return (0, import_utils2.deepMerge)(config, clonedFile);
     };
@@ -9806,7 +9806,7 @@ var init_init = __esm({
     };
     init = (config, options = SET_OPTIONS) => {
       const emotion2 = options.emotion || emotion;
-      const resultConfig = mergeWithLocalFile(config || {});
+      const resultConfig = mergeWithLocalFile(config || {}, options);
       const conf = (0, import_scratch.set)({
         verbose: options.verbose,
         useReset: options.useReset,
@@ -9845,15 +9845,20 @@ var init_init = __esm({
     UPDATE_OPTIONS = {
       emotion
     };
-    reInit = (config, RC_FILE, options = UPDATE_OPTIONS) => {
+    reinit = (config, options = UPDATE_OPTIONS) => {
       const emotion2 = options.emotion || emotion;
-      const resultConfig = mergeWithLocalFile(config || {}, RC_FILE);
+      const resultConfig = mergeWithLocalFile(config || {}, options);
+      const prevStyles = document.querySelector('[data-emotion="smbls"]');
+      console.log(prevStyles);
       const conf = (0, import_scratch.set)({
         verbose: false,
         ...resultConfig
       });
-      emotion2.injectGlobal({ ":root": conf.CSS_VARS });
-      emotion2.injectGlobal(conf.RESET);
+      if (!options.preventInject) {
+        emotion2.injectGlobal({ ":root": conf.CSS_VARS });
+        emotion2.injectGlobal(conf.RESET);
+      }
+      return conf;
     };
     applyCSS = (styles, options = UPDATE_OPTIONS) => {
       const emotion2 = options.emotion || emotion;
@@ -18694,7 +18699,7 @@ var require_utilImports = __commonJS({
     __export2(utilImports_exports, {
       applyCSS: () => import_init2.applyCSS,
       init: () => import_init2.init,
-      reInit: () => import_init2.reInit,
+      reinit: () => import_init2.reinit,
       scratchSystem: () => import_scratch12.scratchSystem,
       scratchUtils: () => import_scratch12.scratchUtils,
       set: () => import_scratch12.set
@@ -19470,21 +19475,21 @@ var require_create3 = __commonJS({
     var import_ignore = require_ignore2();
     var import_inherit = require_inherit2();
     var createPropsStack = (element, parent) => {
-      const { props: props2, __ref } = element;
-      const propsStack = __ref.__props = (0, import_inherit.inheritParentProps)(element, parent);
+      const { props: props2, __ref: ref } = element;
+      const propsStack = ref.__props = (0, import_inherit.inheritParentProps)(element, parent);
       if ((0, import_utils25.isObject)(props2))
         propsStack.push(props2);
       else if (props2 === "inherit" && parent.props)
         propsStack.push(parent.props);
       else if (props2)
         propsStack.push(props2);
-      if ((0, import_utils25.isArray)(__ref.__extend)) {
-        __ref.__extend.forEach((extend) => {
+      if ((0, import_utils25.isArray)(ref.__extend)) {
+        ref.__extend.forEach((extend) => {
           if (extend.props && extend.props !== props2)
             propsStack.push(extend.props);
         });
       }
-      __ref.__props = propsStack;
+      ref.__props = propsStack;
       return propsStack;
     };
     var syncProps = (props2, element) => {
@@ -21143,6 +21148,7 @@ var require_methods2 = __commonJS({
       const obj = {};
       const keyList = keys.call(element);
       keyList.forEach((v) => {
+        var _a;
         if (excl.includes(v))
           return;
         const val = element[v];
@@ -21158,7 +21164,7 @@ var require_methods2 = __commonJS({
         } else if (v === "props") {
           const { __element, update, ...props2 } = element[v];
           obj[v] = props2;
-        } else if ((0, import_utils25.isDefined)(val))
+        } else if ((0, import_utils25.isDefined)(val) && !((_a = element.context) == null ? void 0 : _a.methods[v]))
           obj[v] = val;
       });
       return obj;
@@ -30060,7 +30066,7 @@ __export(smbls_exports, {
   getSystemGlobalTheme: () => getSystemGlobalTheme,
   init: () => init,
   keySetters: () => keySetters,
-  reInit: () => reInit,
+  reinit: () => reinit,
   setClass: () => setClass,
   updateVars: () => updateVars
 });

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "smbls",
-  "version": "2.11.451",
+  "version": "2.11.452",
   "license": "MIT",
   "repository": "https://github.com/symbo-ls/smbls",
-  "gitHead": "f3a8fdc4c82ba34580bd324cd1c922f2041506e3",
+  "gitHead": "65799b9b9cb6d7e6e5e3f0cfc0b1140ccc506b2b",
   "source": "index.js",
   "main": "index.js",
   "module": "index.js",
   "files": [
     "index.js",
+    "package.json",
     "dist"
   ],
   "dependencies": {
-    "@symbo.ls/cli": "^2.11.450",
-    "@symbo.ls/create": "^2.11.451",
+    "@symbo.ls/cli": "^2.11.452",
+    "@symbo.ls/create": "^2.11.452",
     "@symbo.ls/default-config": "^2.11.446",
-    "@symbo.ls/init": "^2.11.450",
+    "@symbo.ls/init": "^2.11.452",
     "@symbo.ls/scratch": "^2.11.450",
-    "@symbo.ls/sync": "^2.11.451",
+    "@symbo.ls/sync": "^2.11.452",
     "@symbo.ls/uikit": "^2.11.451",
     "@symbo.ls/utils": "^2.11.446",
     "attrs-in-props": "^2.11.446",