fix: error using useProvidedComponentClass with componentLoader

baidu · Dec 15, 2021 · 7705623 · 7705623
1 parent d66d8a9
commit 7705623
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/src/runtime/resolver.ts b/src/runtime/resolver.ts
@@ -66,6 +66,13 @@ export function createResolver (exports: {[key: string]: any}, require: nodeRequ
             if (typeof ChildComponentClassOrInstance === 'string' && ChildComponentClassOrInstance === 'self') {
                 return instance
             }
+            // component loader
+            if (
+                Object.prototype.hasOwnProperty.call(ChildComponentClassOrInstance, 'load') &&
+                Object.prototype.hasOwnProperty.call(ChildComponentClassOrInstance, 'placeholder')
+            ) {
+                return ChildComponentClassOrInstance.placeholder
+            }
             if (typeof ChildComponentClassOrInstance !== 'function' && typeof ChildComponentClassOrInstance !== 'object') {
                 throw Error(`external component is not provided: ${tagName}${instance.prototype?.id || ''}`)
             }

diff --git a/test/cases/provide-class/component.js b/test/cases/provide-class/component.js
@@ -8,9 +8,24 @@ const List = san.defineComponent({
     template: '<div>{{ text }}</div>'
 })
 
+const CompA = san.defineComponent({
+    initData () {
+        return {
+            text: 'component a'
+        }
+    },
+    template: '<div>{{ text }}</div>'
+})
+
 const MyComponent = san.defineComponent({
     components: {
-        'x-l': List
+        'x-l': List,
+        'x-g': san.createComponentLoader({
+            load: () => {
+                return List
+            },
+            placeholder: CompA
+        })
     },
     initData () {
         return {
@@ -21,6 +36,7 @@ const MyComponent = san.defineComponent({
     template: `<div>
         <div s-is="c"></div>
         <x-l/>
+        <x-g/>
     </div>`
 })
 

diff --git a/test/cases/provide-class/expected.html b/test/cases/provide-class/expected.html
@@ -1 +1 @@
-<div><!--s-data:{"c": "x-l"}--><div>child</div><div>child</div></div>
+<div><!--s-data:{"c": "x-l"}--><div>child</div><div>child</div><div>component a</div></div>
diff --git a/test/unit/runtime/resolver.spec.ts b/test/unit/runtime/resolver.spec.ts
@@ -33,7 +33,14 @@ describe('runtime/resolver', () => {
                 'child-a': ChildA,
                 'child-b': ChildA,
                 'child-c': 'self',
-                'child-d': 123
+                'child-d': 123,
+                'child-e': san.createComponentLoader(() => Promise.resolve(ChildA)),
+                'child-f': san.createComponentLoader({
+                    load () {
+                        return Promise.resolve(ChildA)
+                    },
+                    placeholder: ChildB
+                })
             }
         })
         const ref = { id: 'id', specifier: './som/path' }
@@ -101,5 +108,13 @@ describe('runtime/resolver', () => {
             }
             expect(fn.mock.calls.length).toBe(1)
         })
+
+        it('should get placeholder of componentLoader', () => {
+            const ChildE = resolver.getChildComponentClass(ref, MyComponent, 'child-e');
+            const ChildF = resolver.getChildComponentClass(ref, MyComponent, 'child-f');
+
+            expect(ChildE).toBe(undefined)
+            expect(ChildF).toBe(ChildB)
+        })
     })
 })