feat(omi): provide and inject supported

Tencent · Aug 5, 2021 · dba1177 · dba1177
1 parent 76892e0
commit dba1177
Show file tree

Hide file tree

Showing 14 changed files with 240 additions and 27 deletions.
diff --git a/packages/omi/dist/omi.d.ts b/packages/omi/dist/omi.d.ts
@@ -108,6 +108,9 @@ declare namespace Omi {
 		normalizedNodeName?: string;
 		elementId: number;
 		isInstalled: boolean;
+		provide?: { [key: string]: any };
+		inject?: string[];
+		injection?: { [key: string]: any };
 
 		update?(ignoreAttrs?: boolean, updateSelf?: boolean): void;
 		forceUpdate?(): void;
@@ -140,6 +143,9 @@ declare namespace Omi {
 		normalizedNodeName?: string;
 		elementId: number;
 		isInstalled: boolean;
+		provide?: { [key: string]: any };
+		inject?: string[];
+		injection?: { [key: string]: any };
 
 		update?(ignoreAttrs?: boolean, updateSelf?: boolean): void;
 		forceUpdate?(): void;
@@ -168,8 +174,8 @@ declare namespace Omi {
 	}
 
 	var createElement: typeof h;
-	
- 	function cloneElement<P>(vnode: VNode<Partial<P>>, props: Partial<P>, ...children: ComponentChildren[]): VNode<Partial<P>>;
+
+	function cloneElement<P>(vnode: VNode<Partial<P>>, props: Partial<P>, ...children: ComponentChildren[]): VNode<Partial<P>>;
 
 	function render(vnode: ComponentChild, parent: string | Element | Document | ShadowRoot | DocumentFragment, store?: object): any;
 

diff --git a/packages/omi/dist/omi.dev.js b/packages/omi/dist/omi.dev.js
diff --git a/packages/omi/dist/omi.dev.js.map b/packages/omi/dist/omi.dev.js.map
diff --git a/packages/omi/dist/omi.esm.js b/packages/omi/dist/omi.esm.js
diff --git a/packages/omi/dist/omi.esm.js.map b/packages/omi/dist/omi.esm.js.map
diff --git a/packages/omi/dist/omi.js b/packages/omi/dist/omi.js
diff --git a/packages/omi/dist/omi.js.map b/packages/omi/dist/omi.js.map
diff --git a/packages/omi/dist/omi.min.js b/packages/omi/dist/omi.min.js
diff --git a/packages/omi/dist/omi.min.js.map b/packages/omi/dist/omi.min.js.map
diff --git a/packages/omi/package.json b/packages/omi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omi",
-  "version": "6.20.1",
+  "version": "6.21.0",
   "description": "Front End Cross-Frameworks Framework.",
   "main": "dist/omi.js",
   "jsnext:main": "dist/omi.esm.js",

diff --git a/packages/omi/src/omi.d.ts b/packages/omi/src/omi.d.ts
@@ -108,6 +108,9 @@ declare namespace Omi {
 		normalizedNodeName?: string;
 		elementId: number;
 		isInstalled: boolean;
+		provide?: { [key: string]: any };
+		inject?: string[];
+		injection?: { [key: string]: any };
 
 		update?(ignoreAttrs?: boolean, updateSelf?: boolean): void;
 		forceUpdate?(): void;
@@ -140,6 +143,9 @@ declare namespace Omi {
 		normalizedNodeName?: string;
 		elementId: number;
 		isInstalled: boolean;
+		provide?: { [key: string]: any };
+		inject?: string[];
+		injection?: { [key: string]: any };
 
 		update?(ignoreAttrs?: boolean, updateSelf?: boolean): void;
 		forceUpdate?(): void;
@@ -168,8 +174,8 @@ declare namespace Omi {
 	}
 
 	var createElement: typeof h;
-	
- 	function cloneElement<P>(vnode: VNode<Partial<P>>, props: Partial<P>, ...children: ComponentChildren[]): VNode<Partial<P>>;
+
+	function cloneElement<P>(vnode: VNode<Partial<P>>, props: Partial<P>, ...children: ComponentChildren[]): VNode<Partial<P>>;
 
 	function render(vnode: ComponentChild, parent: string | Element | Document | ShadowRoot | DocumentFragment, store?: object): any;
 

diff --git a/packages/omi/src/omi.js b/packages/omi/src/omi.js
@@ -52,7 +52,7 @@ const omi = {
 
 options.root.Omi = omi
 options.root.omi = omi
-options.root.Omi.version = '6.20.1'
+options.root.Omi.version = '6.21.0'
 
 export default omi
 

diff --git a/packages/omi/src/we-element.js b/packages/omi/src/we-element.js
@@ -23,6 +23,23 @@ export default class WeElement extends HTMLElement {
       p = p.parentNode || p.host
     }
 
+    if (this.inject) {
+      this.injection = {}
+      p = this.parentNode
+      let provide
+      while (p && !provide) {
+        provide = p.provide
+        p = p.parentNode || p.host
+      }
+      if (provide) {
+        this.inject.forEach(injectKey => {
+          this.injection[injectKey] = provide[injectKey]
+        })
+      } else {
+        throw 'The provide prop was not found on the parent node or the provide type is incorrect.'
+      }
+    }
+
     this.attrsToProps()
 
     this.beforeInstall()