fix: fix not unique plugin name, and overwriting each other

wa0x6e · Mar 16, 2023 · 87cd250 · 87cd250
1 parent 96b376f
commit 87cd250
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -66,7 +66,7 @@ declare namespace CalHeatmap {
     destroy: () => Promise<unknown>;
   }
   export interface IPluginContructor {
-    new (calendar: CalHeatmap): IPlugin;
+    new (calendar?: CalHeatmap): IPlugin;
   }
 
   export interface PluginOptions {

diff --git a/src/plugins/CalendarLabel.ts b/src/plugins/CalendarLabel.ts
@@ -55,20 +55,17 @@ export default class CalendarLabel implements IPlugin {
   computedOptions: ComputedOptions;
 
   constructor(calendar: CalHeatmap) {
-    const {
-      radius, width, height, gutter,
-    } =
-      calendar.options.options.subDomain;
+    const subDomain = calendar?.options?.options?.subDomain;
 
     this.calendar = calendar;
     this.root = null;
     this.shown = false;
     this.options = defaultOptions;
     this.computedOptions = {
-      radius,
-      width,
-      height,
-      gutter,
+      radius: subDomain?.radius,
+      width: subDomain?.width,
+      height: subDomain?.height,
+      gutter: subDomain?.gutter,
       textAlign: 'start',
     };
   }

diff --git a/src/plugins/PluginManager.ts b/src/plugins/PluginManager.ts
@@ -21,10 +21,10 @@ function createPlugin(
 }
 
 function extractPluginName(
-  pluginClass: IPluginContructor,
+  PluginClass: IPluginContructor,
   options?: PluginOptions,
 ): string {
-  return `${pluginClass.name}${options?.key || ''}`;
+  return `${new PluginClass().name}${options?.key || ''}`;
 }
 
 export default class PluginManager {