ember-attacher 3.1.0 → 3.1.1

package/.idea/material_theme_project_new.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="userId" value="43521698:18f28e3c796:-7d14" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>

package/CHANGELOG.md

@@ -2,7 +2,8 @@
 
 
 
-## v3.1.0 (2024-03-07)
+
+## v3.1.1 (2024-04-30)
 
 #### :boom: Breaking Change
 * [#843](https://github.com/tylerturdenpants/ember-attacher/pull/843) Drop ember-in-element-polyfill from dependencies ([@pzubar](https://github.com/pzubar))
@@ -34,6 +35,14 @@
 #### Committers: 1
 - Petro Zubar ([@pzubar](https://github.com/pzubar))
 
+## v3.1.0 (2024-03-07)
+#### :rocket: Enhancement
+* [#932](https://github.com/tylerturdenpants/ember-attacher/pull/932) Drop `@ember/render-modifiers` ([@pzubar](https://github.com/pzubar))
+* [#887](https://github.com/tylerturdenpants/ember-attacher/pull/887) [chore]: Bump ember-cli-babel from 7.26.11 to 8.2.0 ([@dependabot[bot]](https://github.com/apps/dependabot))
+
+#### Committers: 1
+- Petro Zubar ([@pzubar](https://github.com/pzubar))
+
 ## v3.0.0 (2024-03-06)
 
 #### :boom: Breaking Change

package/addon/components/attach-popover.js

@@ -1,6 +1,6 @@
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
-import { cancel, debounce, later, next, run, once } from '@ember/runloop';
+import { cancel, debounce, later, next, run } from '@ember/runloop';
 import { getOwner } from '@ember/application';
 import { guidFor } from '@ember/object/internals';
 import { htmlSafe, isHTMLSafe } from '@ember/template';
@@ -10,7 +10,6 @@ import { isEmpty, typeOf } from '@ember/utils';
 import { autoUpdate, computePosition, arrow, flip, limitShift, shift } from '@floating-ui/dom';
 import { buildWaiter } from '@ember/test-waiters';
 import { tracked } from '@glimmer/tracking';
-import { modifier } from 'ember-modifier';
 import DEFAULTS from '../defaults';
 
 const animationTestWaiter = buildWaiter('attach-popover');
@@ -294,18 +293,20 @@ export default class AttachPopover extends Component {
     this._hide();
   }
 
-  onParentFinderInsert = modifier((element) => {
+  @action
+  onParentFinderInsert(element) {
     this.parentElement = element.parentElement;
-    once(this, '_initializeAttacher')
-  });
+    this._initializeAttacher();
+  }
 
-  _ensureArgumentsAreValid([arrow, useCapture]) {
+  @action
+  _ensureArgumentsAreValid() {
     stripInProduction(() => {
-      if (arrow && this.isFillAnimation) {
+      if (this.arrow && this.isFillAnimation) {
         warn('Animation: \'fill\' is not compatible with arrow: true', { id: 70015 });
       }
 
-      if (useCapture !== this._lastUseCaptureArgumentValue) {
+      if (this.useCapture !== this._lastUseCaptureArgumentValue) {
         warn(
           'The value of the useCapture argument was mutated',
           { id: 'ember-attacher.use-capture-mutated' }
@@ -402,11 +403,15 @@ export default class AttachPopover extends Component {
       });
   }
 
-  onTargetOrTriggerChange = modifier((_, _positional) => {
-    once(this, '_initializeAttacher', ..._positional);
-  });
+  @action
+  onTargetOrTriggerChange() {
+    this._initializeAttacher();
+  }
+
+  @action
+  onIsShownChange() {
+    const isShown = this.isShown;
 
-  onIsShownChange = modifier((_, [isShown]) => {
     if (isShown === true && this._isHidden) {
       this._show();
 
@@ -416,18 +421,7 @@ export default class AttachPopover extends Component {
     } else if (isShown === false && !this._isHidden) {
       this._hide();
     }
-  });
-
-  initializeAttacher = modifier((floatingElement) => {
-    this._floatingElement = floatingElement;
-
-    if (this.renderInPlace) {
-      this.parentElement = floatingElement.parentElement;
-      once(this, '_initializeAttacher');
-    }
-
-    return () => this._cleanup?.();
-  });
+  }
 
   /**
    * ================== SHOW ATTACHMENT LOGIC ==================
@@ -774,14 +768,31 @@ export default class AttachPopover extends Component {
     });
   }
 
-  didInsertArrow = modifier((element) => {
+  @action
+  didInsertFloatingElement(floatingElement) {
+    this._floatingElement = floatingElement;
+
+    if (this.renderInPlace) {
+      this.parentElement = floatingElement.parentElement;
+      this._initializeAttacher();
+    }
+  }
+
+  @action
+  didInsertArrow(element) {
     this._arrowElement = element;
-  })
+  }
+
+  @action
+  onOptionsChange() {
+    this._ensureArgumentsAreValid();
+    this._update();
+  }
 
-  onOptionsChange = modifier((_, positional) => {
-    this._ensureArgumentsAreValid(positional);
-    once(this, '_update')
-  })
+  @action
+  willDestroyFloatingElement() {
+    this._cleanup?.();
+  }
 
   _update() {
     this._cleanup?.();

package/addon/templates/components/attach-popover.hbs

@@ -1,5 +1,5 @@
 {{~#unless this.renderFloatingElement}}
-  <meta hidden {{this.onParentFinderInsert}} {{this.onIsShownChange this.isShown}}/>
+  <meta hidden {{did-insert this.onParentFinderInsert}} {{did-update this.onIsShownChange this.isShown}}/>
 {{~/unless~}}
 
 {{~#if this.renderFloatingElement~}}
@@ -8,16 +8,17 @@
       class="ember-attacher"
       id={{this.id}}
       role={{this.ariaRole}}
-      {{this.onIsShownChange this.isShown}}
-      {{this.onTargetOrTriggerChange this.hideOn this.showOn @explicitTarget}}
-      {{this.onOptionsChange this.arrow this.useCapture this.autoUpdate this.animation this.placement this._renderInPlace this._currentTarget this._middleware}}
-      {{this.initializeAttacher}}
+      {{did-insert this.didInsertFloatingElement}}
+      {{did-update this.onIsShownChange this.isShown}}
+      {{did-update this.onTargetOrTriggerChange this.hideOn this.showOn @explicitTarget}}
+      {{did-update this.onOptionsChange this.autoUpdate this.animation this.arrow this.useCapture this.placement this._renderInPlace this._currentTarget this._middleware}}
+      {{will-destroy this.willDestroyFloatingElement}}
       ...attributes
     >
       <div class={{this._class}} style={{this._style}}>
-        {{yield (hash hide=this.hide)}}
+        {{yield (hash hide=(action 'hide'))}}
         {{#if this.arrow}}
-          <div x-arrow {{this.didInsertArrow}}></div>
+          <div x-arrow {{did-insert this.didInsertArrow}}></div>
         {{/if}}
         {{#if this.isFillAnimation}}
           <div x-circle style="{{this._circleTransitionDuration}}"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-attacher",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Tooltips and popovers for Ember.js apps",
   "keywords": [
     "ember-addon",
@@ -37,8 +37,7 @@
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-sass": "^11.0.1",
     "ember-maybe-in-element": "^2.1.0",
-    "ember-modifier": "^4.1.0",
-    "sass": "^1.71.1"
+    "sass": "^1.72.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.7",
@@ -46,6 +45,7 @@
     "@babel/helper-get-function-arity": "^7.16.7",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@ember/optional-features": "^2.0.0",
+    "@ember/render-modifiers": "^2.0.5",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "~2.9.4",
     "@ember/test-waiters": "^3.1.0",
@@ -70,16 +70,16 @@
     "ember-svg-jar": "~2.4.7",
     "ember-truth-helpers": "^4.0.3",
     "ember-try": "~3.0.0",
-    "eslint": "~8.55.0",
+    "eslint": "~8.57.0",
     "eslint-plugin-decorator-position": "^5.0.2",
     "eslint-plugin-ember": "~11.11.1",
     "eslint-plugin-n": "^16.6.0",
     "flexi": "^2.1.0",
     "loader.js": "^4.7.0",
-    "qunit": "~2.20.0",
+    "qunit": "~2.20.1",
     "qunit-dom": "~3.0.0",
     "release-it": "~15.11.0",
-    "webpack": "~5.89.0"
+    "webpack": "~5.91.0"
   },
   "engines": {
     "node": "16.* || >= 18"