Skip to content

Commit f91d9c3

Browse files
committed
feat: a-toast plugin update
1 parent 081f265 commit f91d9c3

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

src/plugins/a-toast-plugin/a-toast-api.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { AToastWrapper } from '@/components/molecules/a-toast';
2+
13
/* eslint-disable consistent-return */
24
const AToastAPI = (Render, globalOptions) => {
35
const { InstanceLocal, tagId } = globalOptions;
@@ -25,23 +27,13 @@ const AToastAPI = (Render, globalOptions) => {
2527
if (InstanceLocal.$toastInstance) return;
2628
this.setupContainer(tagId);
2729

28-
if ((Render.name === 'Vue' || Render.name === 'VueComponent') && !globalOptions.create) {
29-
const propsData = Render.observable({ ...globalOptions, ...options });
30-
const { AToastWrapper: Component } = await import('@/components/molecules/a-toast');
31-
const ComponentClass = Render.extend(Component);
32-
InstanceLocal.$toastInstance = new ComponentClass({
33-
el: `#${tagId}`,
34-
propsData,
35-
});
36-
return true;
37-
}
38-
39-
if (globalOptions.create) {
40-
globalOptions.create(tagId);
41-
return true;
42-
}
30+
const propsData = Render.observable({ ...globalOptions, ...options });
4331

44-
return false;
32+
const ComponentClass = Render.extend(AToastWrapper);
33+
InstanceLocal.$toastInstance = await new ComponentClass({
34+
el: `#${tagId}`,
35+
propsData,
36+
});
4537
},
4638
async setupContainer(elementId) {
4739
this.parent = document.getElementById(elementId);

src/plugins/a-toast-plugin/a-toast-plugin.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import { AToastAPI } from './a-toast-api';
33

44
class AToastPlugin {
55
static install(Render, globalOptions = {}) {
6-
const isVue = (Render.name === 'Vue' || Render.name === 'VueComponent');
7-
8-
const defaultInstanceLocal = isVue ? Render.prototype : Window;
6+
const defaultInstanceLocal = Render.prototype;
97
const defaultTagId = 'a-toast';
108
if (!globalOptions.InstanceLocal) Object.defineProperty(globalOptions, 'InstanceLocal', { value: defaultInstanceLocal });
119
if (!globalOptions.tagId) Object.defineProperty(globalOptions, 'tagId', { value: defaultTagId });

0 commit comments

Comments
 (0)