fix(all): prevent double registration

aurelia-ui-toolkits · Apr 26, 2024 · c7c9057 · c7c9057
1 parent fb61768
commit c7c9057
Show file tree

Hide file tree

Showing 43 changed files with 338 additions and 131 deletions.
diff --git a/packages/all/src/index.ts b/packages/all/src/index.ts
@@ -39,20 +39,27 @@ import { TooltipConfiguration } from '@aurelia-mdc-web/tooltip';
 import { BaseConfiguration } from '@aurelia-mdc-web/base';
 import { TreeViewConfiguration } from '@aurelia-mdc-web/tree-view';
 
+let registered = false;
+
 export const AllConfiguration = {
   /**
    * Apply this configuration to the provided container.
    */
   register(container: IContainer): IContainer {
-    return container.register(
-      BaseConfiguration, BannerConfiguration, ButtonConfiguration, CardConfiguration, CheckboxConfiguration, ChipsConfiguration, CircularProgressConfiguration,
-      DataTableConfiguration, DialogConfiguration, DrawerConfiguration, ElevationConfiguration, ExpandableConfiguration, FabConfiguration,
-      FloatingLabelConfiguration, FormFieldConfiguration, IconButtonConfiguration, IconConfiguration, ImageListConfiguration, LayoutGridConfiguration,
-      LineRippleConfiguration, LinearProgressConfiguration, ListConfiguration, LookupConfiguration, MenuConfiguration, MenuSurfaceConfiguration,
-      NotchedOutlineConfiguration, RadioConfiguration, RippleConfiguration, SegmentedButtonConfiguration, SelectConfiguration, SliderConfiguration,
-      SnackbarConfiguration, SwitchConfiguration, TabBarConfiguration, TextFieldConfiguration, TooltipConfiguration, TopAppBarConfiguration,
-      TreeViewConfiguration, TypographyConfiguration,
-    );
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(
+        BaseConfiguration, BannerConfiguration, ButtonConfiguration, CardConfiguration, CheckboxConfiguration, ChipsConfiguration, CircularProgressConfiguration,
+        DataTableConfiguration, DialogConfiguration, DrawerConfiguration, ElevationConfiguration, ExpandableConfiguration, FabConfiguration,
+        FloatingLabelConfiguration, FormFieldConfiguration, IconButtonConfiguration, IconConfiguration, ImageListConfiguration, LayoutGridConfiguration,
+        LineRippleConfiguration, LinearProgressConfiguration, ListConfiguration, LookupConfiguration, MenuConfiguration, MenuSurfaceConfiguration,
+        NotchedOutlineConfiguration, RadioConfiguration, RippleConfiguration, SegmentedButtonConfiguration, SelectConfiguration, SliderConfiguration,
+        SnackbarConfiguration, SwitchConfiguration, TabBarConfiguration, TextFieldConfiguration, TooltipConfiguration, TopAppBarConfiguration,
+        TreeViewConfiguration, TypographyConfiguration,
+      );
+    }
   },
   /**
    * Create a new container with this configuration applied to it.

diff --git a/packages/banner/src/index.ts b/packages/banner/src/index.ts
@@ -4,8 +4,15 @@ import { ButtonConfiguration } from '@aurelia-mdc-web/button';
 
 export { MdcBanner };
 
+let registered = false;
+
 export const BannerConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcBanner, ButtonConfiguration);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcBanner, ButtonConfiguration);
+    }
   }
 };
diff --git a/packages/base/src/index.ts b/packages/base/src/index.ts
@@ -10,8 +10,15 @@ export { defaultSlotProcessContent } from './default-slot-process-content';
 export { MdcFocusTrap } from './attributes/mdc-focus-trap';
 export { nextElement } from './next-element';
 
+let registered = false;
+
 export const BaseConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcPromisifyReference, MdcFocusTrap);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcPromisifyReference, MdcFocusTrap);
+    }
   }
 };
diff --git a/packages/button/src/index.ts b/packages/button/src/index.ts
@@ -4,9 +4,15 @@ import { MdcButtonLabel } from './mdc-button-label';
 import { EnhanceMdcButton } from './enhance-mdc-button';
 
 export { MdcButton, MdcButtonLabel };
+let registered = false;
 
 export const ButtonConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcButton, MdcButtonLabel, EnhanceMdcButton);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcButton, MdcButtonLabel, EnhanceMdcButton);
+    }
   }
 };
diff --git a/packages/button/src/mdc-button.ts b/packages/button/src/mdc-button.ts
@@ -55,19 +55,7 @@ export class MdcButton {
     }
   }
 
-  // this is necessary for the route-href to work
-  @bindable
-  href: string;
-  hrefChanged() {
-    if (this.href) {
-      this.root.setAttribute('href', this.href);
-    } else {
-      this.root.removeAttribute('href');
-    }
-  }
-
   attached() {
-    this.hrefChanged();
     const icons = this.root.querySelectorAll('mdc-icon');
     Array.from(icons).forEach(x => x.classList.add('mdc-button__icon'));
   }

diff --git a/packages/card/src/index.ts b/packages/card/src/index.ts
@@ -8,8 +8,15 @@ import { MdcCard } from './mdc-card';
 
 export { MdcCard } from './mdc-card';
 
+let registered = false;
+
 export const CardConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcCard, MdcCardActions, MdcCardMedia, MdcCardActionButtons, MdcCardPrimaryAction, MdcCardActionIcons);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcCard, MdcCardActions, MdcCardMedia, MdcCardActionButtons, MdcCardPrimaryAction, MdcCardActionIcons);
+    }
   }
 };
diff --git a/packages/checkbox/src/index.ts b/packages/checkbox/src/index.ts
@@ -9,15 +9,17 @@ let configured = false;
 
 export const CheckboxConfiguration = {
   register(container: IContainer): IContainer {
-    if (!configured) {
+    if (configured) {
+      return container;
+    } else {
       AppTask.creating(IContainer, c => {
         const attrMapper = c.get(IAttrMapper);
         const nodeObserverLocator = c.get(NodeObserverLocator);
         attrMapper.useTwoWay((el, property) => el.tagName === 'MDC-CHECKBOX' ? property === 'checked' : false);
         nodeObserverLocator.useConfig('MDC-CHECKBOX', 'checked', { events: ['change'], type: CheckedObserver });
       }).register(container);
       configured = true;
+      return container.register(MdcCheckbox, RippleConfiguration);
     }
-    return container.register(MdcCheckbox, RippleConfiguration);
   }
 };
diff --git a/packages/chips/src/index.ts b/packages/chips/src/index.ts
@@ -14,15 +14,17 @@ let configured = false;
 
 export const ChipsConfiguration = {
   register(container: IContainer): IContainer {
-    if (!configured) {
+    if (configured) {
+      return container;
+    } else {
       AppTask.creating(IContainer, c => {
         const attrMapper = c.get(IAttrMapper);
         const nodeObserverLocator = c.get(NodeObserverLocator);
         attrMapper.useTwoWay((el, property) => el.tagName === 'MDC-CHIP' ? property === 'checked' : false);
         nodeObserverLocator.useConfig('MDC-CHIP', 'checked', { events: ['change'], type: CheckedObserver });
       }).register(container);
       configured = true;
+      return container.register(MdcChip, MdcChipAction, EnhanceMdcChipAction, MdcChipSet, RippleConfiguration);
     }
-    return container.register(MdcChip, MdcChipAction, EnhanceMdcChipAction, MdcChipSet, RippleConfiguration);
   }
 };
diff --git a/packages/chips/src/mdc-chip-action/mdc-chip-action.ts b/packages/chips/src/mdc-chip-action/mdc-chip-action.ts
@@ -5,7 +5,7 @@ import { MDCRippleCapableSurface } from '@material/ripple';
 import { MDCChipTrailingActionFoundation } from '@material/chips/action/trailing-foundation';
 import { MDCChipPrimaryActionFoundation } from '@material/chips/action/primary-foundation';
 import { GRAPHIC_SELECTED_WIDTH_STYLE_PROP, computePrimaryActionRippleClientRect } from '@material/chips/action/component-ripple';
-import { bindable, customElement } from 'aurelia';
+import { bindable, customElement, inject } from 'aurelia';
 import { processContent } from '@aurelia/runtime-html';
 import template from './mdc-chip-action.html';
 
@@ -18,6 +18,7 @@ let actionId = 0;
  * @hidden
  * @selector mdc-chip-action
  */
+@inject(Element)
 @customElement({ name: 'mdc-chip-action', template })
 @processContent(defaultSlotProcessContent)
 export class MdcChipAction extends MdcComponent<MDCChipActionFoundation> implements MDCRippleCapableSurface {

diff --git a/packages/circular-progress/src/index.ts b/packages/circular-progress/src/index.ts
@@ -4,8 +4,15 @@ import { MdcCircularProgress } from './mdc-circular-progress';
 
 export { MdcCircularProgress };
 
+let registered = false;
+
 export const CircularProgressConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcCircularProgress);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcCircularProgress);
+    }
   }
 };
diff --git a/packages/data-table/src/index.ts b/packages/data-table/src/index.ts
@@ -5,9 +5,16 @@ import { MdcDataTableRow } from './mdc-data-table-row';
 
 export { MdcDataTable } from './mdc-data-table';
 
+let registered = false;
+
 export const DataTableConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcDataTable, MdcDataTableRow, CheckboxConfiguration);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcDataTable, MdcDataTableRow, CheckboxConfiguration);
+    }
   }
 };
 

diff --git a/packages/dialog/src/index.ts b/packages/dialog/src/index.ts
@@ -8,9 +8,16 @@ import { FocusTrap } from '@material/dom/focus-trap';
 export { MdcDialog } from './mdc-dialog';
 export { MdcDialogService, IMdcDialogOptions } from './mdc-dialog-service';
 
+let registered = false;
+
 export const DialogConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcDialog, MdcDialogActions, MdcDialogTitle, MdcDialogContent);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcDialog, MdcDialogActions, MdcDialogTitle, MdcDialogContent);
+    }
   }
 };
 

diff --git a/packages/drawer/src/index.ts b/packages/drawer/src/index.ts
@@ -7,8 +7,15 @@ import { MdcDrawerHeader } from './mdc-drawer-header/mdc-drawer-header';
 
 export { MdcDrawer, MdcDrawerContent, MdcDrawerAppContent, MdcDrawerHeader };
 
+let registered = false;
+
 export const DrawerConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcDrawer, MdcDrawerContent, MdcDrawerAppContent, MdcDrawerHeader);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcDrawer, MdcDrawerContent, MdcDrawerAppContent, MdcDrawerHeader);
+    }
   }
 };
diff --git a/packages/elevation/src/index.ts b/packages/elevation/src/index.ts
@@ -3,8 +3,15 @@ import { MdcElevation } from './mdc-elevation';
 
 export { MdcElevation } from './mdc-elevation';
 
+let registered = false;
+
 export const ElevationConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcElevation);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcElevation);
+    }
   }
 };
diff --git a/packages/expandable/src/index.ts b/packages/expandable/src/index.ts
@@ -4,8 +4,15 @@ import { MdcExpandable } from './mdc-expandable';
 
 export { MdcExpandable } from './mdc-expandable';
 
+let registered = false;
+
 export const ExpandableConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcExpandable, RippleConfiguration);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcExpandable, RippleConfiguration);
+    }
   }
 };
diff --git a/packages/fab/src/index.ts b/packages/fab/src/index.ts
@@ -6,9 +6,16 @@ import { EnhanceMdcFab } from './enhance-mdc-fab';
 
 export { MdcFab } from './mdc-fab';
 
+let registered = false;
+
 export const FabConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcFab, MdcFabIcon, RippleConfiguration, EnhanceMdcFab);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcFab, MdcFabIcon, RippleConfiguration, EnhanceMdcFab);
+    }
   }
 };
 
diff --git a/packages/floating-label/src/index.ts b/packages/floating-label/src/index.ts
@@ -3,8 +3,15 @@ import { IContainer } from 'aurelia';
 
 export { MdcFloatingLabel } from './mdc-floating-label';
 
+let registered = false;
+
 export const FloatingLabelConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcFloatingLabel);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcFloatingLabel);
+    }
   }
 };
diff --git a/packages/form-field/src/index.ts b/packages/form-field/src/index.ts
@@ -3,8 +3,15 @@ import { MdcFormField } from './mdc-form-field';
 
 export { MdcFormField } from './mdc-form-field';
 
+let registered = false;
+
 export const FormFieldConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcFormField);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcFormField);
+    }
   }
 };
diff --git a/packages/icon-button/src/index.ts b/packages/icon-button/src/index.ts
@@ -5,8 +5,15 @@ import { EnhanceMdcIconButton } from './enhance-mdc-icon-button';
 
 export { MdcIconButton, MdcIconButtonIcon };
 
+let registered = false;
+
 export const IconButtonConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcIconButton, MdcIconButtonIcon, EnhanceMdcIconButton);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcIconButton, MdcIconButtonIcon, EnhanceMdcIconButton);
+    }
   }
 };
diff --git a/packages/icon/src/index.ts b/packages/icon/src/index.ts
@@ -3,8 +3,15 @@ import { MdcIcon } from './mdc-icon';
 
 export { MdcIcon };
 
+let registered = false;
+
 export const IconConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcIcon);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcIcon);
+    }
   }
 };
diff --git a/packages/image-list/src/index.ts b/packages/image-list/src/index.ts
@@ -4,8 +4,15 @@ import { MdcImageListItem } from './mdc-image-list-item/mdc-image-list-item';
 
 export { MdcImageList } from './mdc-image-list';
 
+let registered = false;
+
 export const ImageListConfiguration = {
   register(container: IContainer): IContainer {
-    return container.register(MdcImageList, MdcImageListItem);
+    if (registered) {
+      return container;
+    } else {
+      registered = true;
+      return container.register(MdcImageList, MdcImageListItem);
+    }
   }
 };