Remove ember render modifiers (#485)

cibernox · May 6, 2024 · d36c068 · d36c068
1 parent 57877b1
commit d36c068
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 28 deletions.
diff --git a/ember-power-calendar/package.json b/ember-power-calendar/package.json
@@ -68,7 +68,6 @@
     "@embroider/addon-shim": "^1.8.7",
     "decorator-transforms": "^1.0.1",
     "@embroider/util": "^1.13.0",
-    "@ember/render-modifiers": "^2.1.0",
     "@embroider/macros": "^1.15.0",
     "ember-assign-helper": "^0.5.0",
     "ember-element-helper": "^0.8.6",

diff --git a/ember-power-calendar/src/components/power-calendar-multiple.hbs b/ember-power-calendar/src/components/power-calendar-multiple.hbs
@@ -3,9 +3,7 @@
   Days=(component (ensure-safe-component (or @daysComponent this.daysComponent)) calendar=(readonly this.publicAPI))
 )) as |calendar|}}
   {{#let (element this.tagWithDefault) as |Tag|}}
-    <Tag class="ember-power-calendar" ...attributes id={{calendar.uniqueId}}
-      {{will-destroy this.destroyElement}}
-    >
+    <Tag class="ember-power-calendar" ...attributes id={{calendar.uniqueId}}>
       {{#if (has-block)}}
         {{yield calendar}}
       {{else}}

diff --git a/ember-power-calendar/src/components/power-calendar-multiple.ts b/ember-power-calendar/src/components/power-calendar-multiple.ts
@@ -80,6 +80,11 @@ export default class PowerCalendarMultipleComponent extends Component<PowerCalen
     }
   }
 
+  willDestroy(): void {
+    super.willDestroy();
+    this.unregisterCalendar();
+  }
+
   get publicActions(): PowerCalendarActions {
     return publicActionsObject(
       this.args.onSelect,
@@ -183,11 +188,6 @@ export default class PowerCalendarMultipleComponent extends Component<PowerCalen
     }
   }
 
-  @action
-  destroyElement() {
-    this.unregisterCalendar();
-  }
-
   // Methods
   _buildCollection(days: PowerCalendarDay[]): NormalizeMultipleActionValue {
     let selected = this.selected || [];

diff --git a/ember-power-calendar/src/components/power-calendar-range.hbs b/ember-power-calendar/src/components/power-calendar-range.hbs
@@ -3,9 +3,7 @@
   Days=(component (ensure-safe-component (or @daysComponent this.daysComponent)) calendar=(readonly this.publicAPI))
 )) as |calendar|}}
   {{#let (element this.tagWithDefault) as |Tag|}}
-    <Tag class="ember-power-calendar" ...attributes id={{calendar.uniqueId}}
-      {{will-destroy this.destroyElement}}
-    >
+    <Tag class="ember-power-calendar" ...attributes id={{calendar.uniqueId}}>
       {{#if (has-block)}}
         {{yield calendar}}
       {{else}}

diff --git a/ember-power-calendar/src/components/power-calendar-range.ts b/ember-power-calendar/src/components/power-calendar-range.ts
@@ -94,6 +94,11 @@ export default class PowerCalendarRangeComponent extends Component<PowerCalendar
     }
   }
 
+  willDestroy(): void {
+    super.willDestroy();
+    this.unregisterCalendar();
+  }
+
   get publicActions(): PowerCalendarActions {
     return publicActionsObject(
       this.args.onSelect,
@@ -229,11 +234,6 @@ export default class PowerCalendarRangeComponent extends Component<PowerCalendar
     }
   }
 
-  @action
-  destroyElement() {
-    this.unregisterCalendar();
-  }
-
   _formatRange(v: number | undefined) {
     if (typeof v === 'number') {
       return v * DAY_IN_MS;

diff --git a/ember-power-calendar/src/components/power-calendar.hbs b/ember-power-calendar/src/components/power-calendar.hbs
@@ -3,9 +3,7 @@
   Days=(component (ensure-safe-component (or @daysComponent this.daysComponent)) calendar=(readonly this.publicAPI))
 )) as |calendar|}}
   {{#let (element this.tagWithDefault) as |Tag|}}
-    <Tag class="ember-power-calendar" ...attributes id={{calendar.uniqueId}}
-      {{will-destroy this.destroyElement}}
-    >
+    <Tag class="ember-power-calendar" ...attributes id={{calendar.uniqueId}}>
       {{#if (has-block)}}
         {{yield calendar}}
       {{else}}

diff --git a/ember-power-calendar/src/components/power-calendar.ts b/ember-power-calendar/src/components/power-calendar.ts
@@ -121,6 +121,11 @@ export default class PowerCalendarComponent extends Component<PowerCalendarSigna
     }
   }
 
+  willDestroy(): void {
+    super.willDestroy();
+    this.unregisterCalendar();
+  }
+
   get publicActions(): PowerCalendarActions {
     return publicActionsObject(
       this.args.onSelect,
@@ -194,11 +199,6 @@ export default class PowerCalendarComponent extends Component<PowerCalendarSigna
     }
   }
 
-  @action
-  destroyElement() {
-    this.unregisterCalendar();
-  }
-
   // Methods
   registerCalendar() {
     if (window) {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml