@viewfly/scoped-css 0.0.26 → 0.0.27

package/bundles/css-modules.d.ts

@@ -1,2 +1,2 @@
 import { JSXInternal } from '@viewfly/core';
-export declare function withScopedCSS(cssNamespace: string | string[], render: () => JSXInternal.Element): () => JSXInternal.JSXNode;
+export declare function withScopedCSS(cssNamespace: string | string[], render: () => JSXInternal.JSXNode): () => JSXInternal.JSXNode;

package/bundles/index.esm.js

@@ -1,28 +1,21 @@
-import { JSXElement, JSXComponent } from '@viewfly/core';
+import { JSXElement } from '@viewfly/core';
 
-function addOnScopedKeys(template, cssNamespace) {
-    if (template instanceof JSXElement || template instanceof JSXComponent) {
-        const children = template.props.children;
-        const nameSpaces = Array.isArray(cssNamespace) ? cssNamespace : [cssNamespace];
-        nameSpaces.forEach(i => {
-            if (typeof i === 'string' && i) {
-                template.props[i] = '';
-            }
-        });
-        if (Array.isArray(children)) {
-            children.forEach(child => {
-                addOnScopedKeys(child, cssNamespace);
-            });
-        }
-        else {
-            addOnScopedKeys(children, cssNamespace);
-        }
-    }
-    return template;
-}
 function withScopedCSS(cssNamespace, render) {
-    return function scopedCSS() {
-        return addOnScopedKeys(render(), cssNamespace);
+    if (!cssNamespace) {
+        return render;
+    }
+    return function () {
+        const oldCreate = JSXElement.create;
+        const spaces = Array.isArray(cssNamespace) ? cssNamespace : [cssNamespace];
+        JSXElement.create = function (name, props, key) {
+            for (const scopedId of spaces) {
+                props[scopedId] = '';
+            }
+            return oldCreate.apply(JSXElement, [name, props, key]);
+        };
+        const vDom = render();
+        JSXElement.create = oldCreate;
+        return vDom;
     };
 }
 

package/bundles/index.js

@@ -2,29 +2,22 @@
 
 var core = require('@viewfly/core');
 
-function addOnScopedKeys(template, cssNamespace) {
-    if (template instanceof core.JSXElement || template instanceof core.JSXComponent) {
-        const children = template.props.children;
-        const nameSpaces = Array.isArray(cssNamespace) ? cssNamespace : [cssNamespace];
-        nameSpaces.forEach(i => {
-            if (typeof i === 'string' && i) {
-                template.props[i] = '';
-            }
-        });
-        if (Array.isArray(children)) {
-            children.forEach(child => {
-                addOnScopedKeys(child, cssNamespace);
-            });
-        }
-        else {
-            addOnScopedKeys(children, cssNamespace);
-        }
-    }
-    return template;
-}
 function withScopedCSS(cssNamespace, render) {
-    return function scopedCSS() {
-        return addOnScopedKeys(render(), cssNamespace);
+    if (!cssNamespace) {
+        return render;
+    }
+    return function () {
+        const oldCreate = core.JSXElement.create;
+        const spaces = Array.isArray(cssNamespace) ? cssNamespace : [cssNamespace];
+        core.JSXElement.create = function (name, props, key) {
+            for (const scopedId of spaces) {
+                props[scopedId] = '';
+            }
+            return oldCreate.apply(core.JSXElement, [name, props, key]);
+        };
+        const vDom = render();
+        core.JSXElement.create = oldCreate;
+        return vDom;
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/scoped-css",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "A library for supporting scoped style sheets in the Viewfly framework。",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -12,7 +12,7 @@
   "license": "MIT",
   "keywords": [],
   "dependencies": {
-    "@viewfly/core": "^0.0.26"
+    "@viewfly/core": "^0.0.27"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.3",
@@ -32,5 +32,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "2c80fa3f23c647a918d542c0b626384d22766cb8"
+  "gitHead": "b66ca589f7662cd518fc2e5955b3e3ff9de83f94"
 }