ember-sortable 4.0.1 → 4.0.3

package/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 
 
+
+
+## v4.0.3 (2022-10-14)
+
+#### :bug: Bug Fix
+* [#485](https://github.com/adopted-ember-addons/ember-sortable/pull/485) when item is disabled, do not add event listeners ([@st-h](https://github.com/st-h))
+* [#472](https://github.com/adopted-ember-addons/ember-sortable/pull/472) sortableGroup may be undefined ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* [#490](https://github.com/adopted-ember-addons/ember-sortable/pull/490) Bump parse-url from 6.0.0 to 6.0.5 ([@dependabot[bot]](https://github.com/apps/dependabot))
+* [#491](https://github.com/adopted-ember-addons/ember-sortable/pull/491) Bump vm2 from 3.9.9 to 3.9.11 ([@dependabot[bot]](https://github.com/apps/dependabot))
+* [#496](https://github.com/adopted-ember-addons/ember-sortable/pull/496) Bump terser from 5.13.1 to 5.15.1 ([@dependabot[bot]](https://github.com/apps/dependabot))
+* [#494](https://github.com/adopted-ember-addons/ember-sortable/pull/494) Move test config to the dummy app ([@Windvis](https://github.com/Windvis))
+* [#495](https://github.com/adopted-ember-addons/ember-sortable/pull/495) Use the `isTesting` macro ([@Windvis](https://github.com/Windvis))
+* [#488](https://github.com/adopted-ember-addons/ember-sortable/pull/488) Remove unused dependencies ([@bertdeblock](https://github.com/bertdeblock))
+
+#### Committers: 4
+- Bert De Block ([@bertdeblock](https://github.com/bertdeblock))
+- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))
+- Steve ([@st-h](https://github.com/st-h))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+## v4.0.2 (2022-10-06)
+
+#### :bug: Bug Fix
+* [#493](https://github.com/adopted-ember-addons/ember-sortable/pull/493) fix: Handle element in sortable item should be the most recent ([@nicolechung](https://github.com/nicolechung))
+
+#### Committers: 1
+- nicole chung ([@nicolechung](https://github.com/nicolechung))
+
 ## v4.0.1 (2022-10-03)
 
 #### :memo: Documentation

package/addon/modifiers/sortable-item.js

@@ -12,11 +12,8 @@ import { getBorderSpacing } from '../utils/css-calculation';
 import { buildWaiter } from '@ember/test-waiters';
 import { inject as service } from '@ember/service';
 import { assert, deprecate } from '@ember/debug';
-import config from 'ember-get-config';
 import { registerDestructor } from '@ember/destroyable';
-
-const { environment } = config;
-const isTesting = environment === 'test';
+import { isTesting } from '@embroider/macros';
 
 const sortableItemWaiter = buildWaiter('sortable-item-waiter');
 
@@ -67,11 +64,11 @@ export default class SortableItemModifier extends Modifier {
   }
 
   get direction() {
-    return this.sortableGroup.direction;
+    return this.sortableGroup?.direction;
   }
 
   get groupDisabled() {
-    return this.sortableGroup.disabled;
+    return this.sortableGroup?.disabled;
   }
 
   /**
@@ -244,7 +241,7 @@ export default class SortableItemModifier extends Modifier {
    @property disableCheckScrollBounds
    */
   get disableCheckScrollBounds() {
-    return this.named.disableCheckScrollBounds != undefined ? this.named.disableCheckScrollBounds : isTesting;
+    return this.named.disableCheckScrollBounds != undefined ? this.named.disableCheckScrollBounds : isTesting();
   }
 
   /**
@@ -268,6 +265,8 @@ export default class SortableItemModifier extends Modifier {
       return;
     }
 
+    this.setupHandleElement();
+
     // If the event is coming from within the item, we do not want to activate keyboard reorder mode.
     if (event.target === this.handleElement || event.target === this.element) {
       this.sortableGroup.activateKeyDown(this);
@@ -803,17 +802,34 @@ export default class SortableItemModifier extends Modifier {
     this.element.addEventListener('keydown', this.keyDown);
     this.element.addEventListener('mousedown', this.mouseDown);
     this.element.addEventListener('touchstart', this.touchStart);
+    this.listenersRegistered = true;
   }
 
   removeEventListener() {
     this.element.removeEventListener('keydown', this.keyDown);
     this.element.removeEventListener('mousedown', this.mouseDown);
     this.element.removeEventListener('touchstart', this.touchStart);
+    this.listenersRegistered = false;
+  }
+
+  setupHandleElement() {
+    this.handleElement = this.element.querySelector(this.handle);
+
+    if (this.handleElement) {
+      this.handleElement.style['touch-action'] = 'none';
+    } else {
+      this.element.style['touch-action'] = 'none';
+    }
   }
 
   element;
   didSetup = false;
 
+  /**
+   * tracks if event listeners have been registered. Registering event handlers is unnecessary if item is disabled.
+   */
+  listenersRegistered = false;
+
   constructor(owner, args) {
     super(owner, args);
     registerDestructor(this, cleanup);
@@ -827,20 +843,19 @@ export default class SortableItemModifier extends Modifier {
 
     // Instead of using `event.preventDefault()` in the 'primeDrag' event,
     // (doesn't work in Chrome 56), we set touch-action: none as a workaround.
-    this.handleElement = this.element.querySelector(this.handle);
-
-    if (this.handleElement) {
-      this.handleElement.style['touch-action'] = 'none';
-    } else {
-      this.element.style['touch-action'] = 'none';
-    }
+    this.setupHandleElement();
 
     if (!this.didSetup) {
-      this.addEventListener();
       this.element.dataset.sortableItem = true;
       this.sortableService.registerItem(this.groupName, this);
       this.didSetup = true;
     }
+
+    if (this.named.disabled && this.listenersRegistered) {
+      this.removeEventListener();
+    } else if (!this.named.disabled && !this.listenersRegistered) {
+      this.addEventListener();
+    }
   }
 }
 

package/config/environment.js

@@ -1,26 +1,5 @@
 'use strict';
 
-module.exports = function (environment) {
-  const ENV = {
-    environment,
-
-    'ember-a11y-testing': {
-      componentOptions: {
-        turnAuditOff: true,
-        excludeAxeCore: true,
-        axeOptions: {
-          iframes: false,
-          reporter: 'v2',
-          resultTypes: ['violations'],
-          rules: {
-            'duplicate-id': { enabled: false },
-            'duplicate-id-active': { enabled: false },
-            'duplicate-id-aria': { enabled: false },
-          },
-        },
-      },
-    },
-  };
-
-  return ENV;
+module.exports = function (/* environment, appConfig */) {
+  return {};
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-sortable",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "Sortable UI primitives for Ember.",
   "keywords": [
     "ember-addon",
@@ -24,14 +24,10 @@
     "release": "release-it"
   },
   "dependencies": {
-    "@ember/render-modifiers": "^1.0.2 || ^2.0.0",
     "@ember/test-waiters": "^3.0.1",
+    "@embroider/macros": "^1.9.0",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
-    "ember-cli-version-checker": "^5.1.2",
-    "ember-get-config": "^2.0.0",
-    "ember-modifier": "^3.2.0",
-    "ember-test-selectors": "^6.0.0"
+    "ember-modifier": "^3.2.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
@@ -45,6 +41,7 @@
     "ember-auto-import": "^2.4.0",
     "ember-cli": "^4.2.0",
     "ember-cli-dependency-checker": "^3.0.0",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.0.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
@@ -56,6 +53,7 @@
     "ember-source": "^4.2.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.2.0",
+    "ember-test-selectors": "^6.0.0",
     "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.4.0",