ember-sortable 4.0.3 → 5.0.1

package/README.md

@@ -14,7 +14,13 @@ Sortable UI primitives for Ember.
 
 ## Requirements
 
-In version 3.0.0+, Node.js v12 or above And Ember.js v3.24 or above
+| Ember Sortable | Ember | Node |
+|----------------|-------|------|
+| 3.0.0          | 3.24+ | 12+  |
+| 4.0.0          | 3.24+ | 14+  |
+| 5.0.0          | 3.28+ | n/a[^1]  |
+
+[^1]: Node is not relevant for v2 addons. As of v5.0.0, ember-sortable is a v2 addon. V2 addons don't have to be for browser-only contexts, but ember-sortable is -- so node is not relevant anymore. This is different from v1 addons, which are not browser libraries, but node programs that happen emit browser code to the consuming app at app-build time.
 
 ## Installation
 
@@ -339,20 +345,20 @@ and returns a `string` constructed from the `config`.
 - [`reorder`][reorder]: Reorders elements to the specified state.
 - [`keyboard`][keyboard]: Keycode constants for quick.
 
-[drag]: addon-test-support/helpers/drag.js
-[reorder]: addon-test-support/helpers/reorder.js
-[keyboard]: addon-test-support/utils/kebyoard.js
+[drag]: addon/src/test-support/helpers/drag.js
+[reorder]: addon/src/test-support/helpers/reorder.js
+[keyboard]: addon/src/test-support/utils/kebyoard.js
 
 To include them in your application, you can import them:
 
 ```js
-import { drag, reorder } from 'ember-sortable/test-support/helpers';
-import {
+import { 
+  drag, reorder,
   ENTER_KEY_CODE,
   SPACE_KEY_CODE,
   ESCAPE_KEY_CODE,
   ARROW_KEY_CODES,
-} from 'ember-sortable/test-support/utils/keyboard';
+} from 'ember-sortable/test-support';
 ```
 
 ### Examples

package/addon-main.js

@@ -0,0 +1,2 @@
+const { addonV1Shim } = require('@embroider/addon-shim');
+module.exports = addonV1Shim(__dirname);

package/dist/_app_/modifiers/sortable-group.js

@@ -0,0 +1 @@
+export { default } from "ember-sortable/modifiers/sortable-group";

package/dist/_app_/modifiers/sortable-handle.js

@@ -0,0 +1 @@
+export { default } from "ember-sortable/modifiers/sortable-handle";

package/dist/_app_/modifiers/sortable-item.js

@@ -0,0 +1 @@
+export { default } from "ember-sortable/modifiers/sortable-item";

package/dist/_app_/services/ember-sortable-internal-state.js

@@ -0,0 +1 @@
+export { default } from "ember-sortable/services/ember-sortable-internal-state";

package/dist/_rollupPluginBabelHelpers-839d0adb.js

@@ -0,0 +1,63 @@
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : String(i);
+}
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _initializerDefineProperty(target, property, descriptor, context) {
+  if (!descriptor) return;
+  Object.defineProperty(target, property, {
+    enumerable: descriptor.enumerable,
+    configurable: descriptor.configurable,
+    writable: descriptor.writable,
+    value: descriptor.initializer ? descriptor.initializer.call(context) : void 0
+  });
+}
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
+  var desc = {};
+  Object.keys(descriptor).forEach(function (key) {
+    desc[key] = descriptor[key];
+  });
+  desc.enumerable = !!desc.enumerable;
+  desc.configurable = !!desc.configurable;
+  if ('value' in desc || desc.initializer) {
+    desc.writable = true;
+  }
+  desc = decorators.slice().reverse().reduce(function (desc, decorator) {
+    return decorator(target, property, desc) || desc;
+  }, desc);
+  if (context && desc.initializer !== void 0) {
+    desc.value = desc.initializer ? desc.initializer.call(context) : void 0;
+    desc.initializer = undefined;
+  }
+  if (desc.initializer === void 0) {
+    Object.defineProperty(target, property, desc);
+    desc = null;
+  }
+  return desc;
+}
+
+export { _applyDecoratedDescriptor as _, _defineProperty as a, _initializerDefineProperty as b };
+//# sourceMappingURL=_rollupPluginBabelHelpers-839d0adb.js.map

package/dist/_rollupPluginBabelHelpers-839d0adb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_rollupPluginBabelHelpers-839d0adb.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/{addon → dist}/modifiers/sortable-group.js

@@ -1,22 +1,14 @@
-/* eslint-disable ember/no-computed-properties-in-native-classes */
-/* eslint-disable ember/no-incorrect-calls-with-inline-anonymous-functions */
+import { _ as _applyDecoratedDescriptor, a as _defineProperty, b as _initializerDefineProperty } from '../_rollupPluginBabelHelpers-839d0adb.js';
 import Modifier from 'ember-modifier';
-import { action, computed, set } from '@ember/object';
-import {
-  isDownArrowKey,
-  isEnterKey,
-  isEscapeKey,
-  isLeftArrowKey,
-  isRightArrowKey,
-  isSpaceKey,
-  isUpArrowKey,
-} from '../utils/keyboard';
-import { ANNOUNCEMENT_ACTION_TYPES } from '../utils/constant';
-import { defaultA11yAnnouncementConfig } from '../utils/defaults';
-import { next, schedule, scheduleOnce, later } from '@ember/runloop';
-import { inject as service } from '@ember/service';
-import { registerDestructor, isDestroyed } from '@ember/destroyable';
-
+import { computed, action, set } from '@ember/object';
+import { isEnterKey, isSpaceKey, isDownArrowKey, isUpArrowKey, isLeftArrowKey, isRightArrowKey, isEscapeKey } from '../utils/keyboard.js';
+import { ANNOUNCEMENT_ACTION_TYPES } from '../utils/constant.js';
+import { defaultA11yAnnouncementConfig } from '../utils/defaults.js';
+import { scheduleOnce, later, schedule, next } from '@ember/runloop';
+import { inject } from '@ember/service';
+import { isDestroyed, registerDestructor } from '@ember/destroyable';
+
+var _dec, _dec2, _class, _descriptor;
 const NO_MODEL = {};
 
 /**
@@ -39,21 +31,7 @@ const NO_MODEL = {};
  *      {{/each}}
  *    </ol>
  */
-export default class SortableGroupModifier extends Modifier {
-  /** Primary keyboard utils */
-  // Tracks the currently selected item
-  _selectedItem = null;
-  // Tracks the current move
-  move = null;
-  moves = [];
-
-  // Tracks the status of keyboard reorder mode
-  isKeyboardReorderModeEnabled = false;
-
-  isKeyDownEnabled = false;
-
-  // Tracks if we're still performing a programmatic focus.
-  isRetainingFocus = false;
+let SortableGroupModifier = (_dec = inject('ember-sortable-internal-state'), _dec2 = computed('direction', 'sortedItems'), (_class = class SortableGroupModifier extends Modifier {
   /** End of keyboard utils */
 
   get disabled() {
@@ -91,11 +69,9 @@ export default class SortableGroupModifier extends Modifier {
   get a11yAnnouncementConfig() {
     return this.named.a11yAnnouncementConfig || defaultA11yAnnouncementConfig;
   }
-
   get itemVisualClass() {
     return this.named.itemVisualClass || 'is-activated';
   }
-
   get a11yItemName() {
     return this.named.a11yItemName || 'item';
   }
@@ -108,7 +84,6 @@ export default class SortableGroupModifier extends Modifier {
    *
    * @param {Event} event a DOM event.
    */
-  @action
   focusOut() {
     if (!this.isRetainingFocus && !this._isElementWithinHandle(document.activeElement)) {
       this.cancelKeyboardSelection();
@@ -124,7 +99,6 @@ export default class SortableGroupModifier extends Modifier {
    *
    * @param {Event} event a DOM event
    */
-  @action
   keyDown(event) {
     if (!this.isKeyDownEnabled) {
       return;
@@ -133,15 +107,12 @@ export default class SortableGroupModifier extends Modifier {
     // Note: If handle is specified, we need to target the keyDown on the handle
     const isKeyboardReorderModeEnabled = this.isKeyboardReorderModeEnabled;
     const _selectedItem = this._selectedItem;
-
     if (!isKeyboardReorderModeEnabled && (isEnterKey(event) || isSpaceKey(event))) {
       this._prepareKeyboardReorderMode();
       this._announceAction(ANNOUNCEMENT_ACTION_TYPES.ACTIVATE);
       this._updateItemVisualIndicators(_selectedItem, true);
       this._updateHandleVisualIndicators(_selectedItem, true);
-
       this.isRetainingFocus = true;
-
       scheduleOnce('render', () => {
         this.element.focus();
         this.isRetainingFocus = false;
@@ -151,7 +122,6 @@ export default class SortableGroupModifier extends Modifier {
       event.preventDefault();
       return;
     }
-
     if (isKeyboardReorderModeEnabled) {
       this._handleKeyboardReorder(event);
       event.preventDefault();
@@ -207,7 +177,6 @@ export default class SortableGroupModifier extends Modifier {
   _handleKeyboardReorder(event) {
     const direction = this.direction;
     const selectedItem = this._selectedItem;
-
     if (direction === 'y' && isDownArrowKey(event)) {
       this.moveItem(selectedItem, 1);
     } else if (direction === 'y' && isUpArrowKey(event)) {
@@ -221,7 +190,6 @@ export default class SortableGroupModifier extends Modifier {
       const itemElement = selectedItem.element;
       this._announceAction(ANNOUNCEMENT_ACTION_TYPES.CONFIRM);
       this.confirmKeyboardSelection();
-
       this.isRetainingFocus = true;
       scheduleOnce('render', () => this._focusItem(itemElement));
     } else if (isEscapeKey(event)) {
@@ -229,7 +197,6 @@ export default class SortableGroupModifier extends Modifier {
       const _selectedItemElement = selectedItem.element;
       this._announceAction(ANNOUNCEMENT_ACTION_TYPES.CANCEL);
       this.cancelKeyboardSelection();
-
       this.isRetainingFocus = true;
       scheduleOnce('render', () => {
         const moves = this.moves;
@@ -254,7 +221,6 @@ export default class SortableGroupModifier extends Modifier {
   moveItem(item, delta) {
     const sortedItems = this.sortedItems;
     const moves = this.moves;
-
     const sortedIndex = sortedItems.indexOf(item);
     const newSortedIndex = sortedIndex + delta;
 
@@ -267,7 +233,6 @@ export default class SortableGroupModifier extends Modifier {
     scheduleOnce('render', () => {
       this._move(sortedIndex, newSortedIndex);
       this._updateHandleVisualIndicators(item, true);
-
       moves.push([sortedIndex, newSortedIndex]);
     });
   }
@@ -279,7 +244,6 @@ export default class SortableGroupModifier extends Modifier {
    * 3. Tears down the application container, so we are not focus locked within the application.
    * 4. Resets the current selected item.
    */
-  @action
   cancelKeyboardSelection() {
     const _selectedItem = this._selectedItem;
     this._disableKeyboardReorderMode();
@@ -324,24 +288,20 @@ export default class SortableGroupModifier extends Modifier {
   _announceAction(type, delta = null) {
     const a11yAnnouncementConfig = this.a11yAnnouncementConfig;
     const a11yItemName = this.a11yItemName;
-
     if (!a11yItemName || !(type in a11yAnnouncementConfig)) {
       return;
     }
-
     const sortedItems = this.sortedItems;
     const _selectedItem = this._selectedItem;
     const index = sortedItems.indexOf(_selectedItem);
     const announcer = this.announcer;
-
     const config = {
       a11yItemName,
       index: index,
       maxLength: sortedItems.length,
       direction: this.direction,
-      delta,
+      delta
     };
-
     const message = a11yAnnouncementConfig[type](config);
     announcer.textContent = message;
 
@@ -366,11 +326,9 @@ export default class SortableGroupModifier extends Modifier {
    */
   _updateItemVisualIndicators(item, isActive) {
     const itemVisualClass = this.itemVisualClass;
-
     if (!itemVisualClass || !item) {
       return;
     }
-
     if (isActive) {
       item.element.classList.add(itemVisualClass);
     } else {
@@ -386,30 +344,24 @@ export default class SortableGroupModifier extends Modifier {
    */
   _updateHandleVisualIndicators(item, isUpdate) {
     const handleVisualClass = this.handleVisualClass;
-
     if (handleVisualClass === NO_MODEL || !item) {
       return;
     }
-
     const sortedItems = this.sortedItems;
     const direction = this.direction;
     const index = sortedItems.indexOf(item);
     const handle = item.element.querySelector('[data-sortable-handle');
     const visualHandle = handle ? handle : item.element;
     const visualKeys = direction === 'y' ? ['UP', 'DOWN'] : ['LEFT', 'RIGHT'];
-
-    visualKeys.forEach((visualKey) => {
+    visualKeys.forEach(visualKey => {
       visualHandle.classList.remove(handleVisualClass[visualKey]);
     });
-
     if (!isUpdate) {
       return;
     }
-
     if (index > 0) {
       visualHandle.classList.add(handleVisualClass[visualKeys[0]]);
     }
-
     if (index < sortedItems.length - 1) {
       visualHandle.classList.add(handleVisualClass[visualKeys[1]]);
     }
@@ -459,7 +411,6 @@ export default class SortableGroupModifier extends Modifier {
     this.element.removeAttribute('role');
     this.element.removeAttribute('tabIndex');
   }
-
   _prepareKeyboardReorderMode() {
     this._enableKeyboardReorderMode();
     this._setupA11yApplicationContainer();
@@ -488,10 +439,6 @@ export default class SortableGroupModifier extends Modifier {
   get onChange() {
     return this.named.onChange;
   }
-
-  @service('ember-sortable-internal-state')
-  sortableService;
-
   /**
    * This is the group name used to keep groups separate if there are more than one on the screen at a time.
    * If no group is assigned a default is used
@@ -505,8 +452,7 @@ export default class SortableGroupModifier extends Modifier {
 
   /**
    This is an array of SortableItemModifiers
-
-   @property items
+    @property items
    @type SortableItemModifier[]
    */
   get items() {
@@ -521,7 +467,6 @@ export default class SortableGroupModifier extends Modifier {
    *
    * @type {Element}
    */
-  announcer = null;
 
   /**
    Position for the first item.
@@ -529,11 +474,9 @@ export default class SortableGroupModifier extends Modifier {
    @property firstItemPosition
    @type Number
    */
-  @computed('direction', 'sortedItems')
   get firstItemPosition() {
     const direction = this.direction;
     const sortedItems = this.sortedItems;
-
     return sortedItems[0][`${direction}`] - sortedItems[0].spacing;
   }
 
@@ -550,7 +493,6 @@ export default class SortableGroupModifier extends Modifier {
   /**
    * Enables keyboard navigation
    */
-  @action
   activateKeyDown(selectedItem) {
     this._selectedItem = selectedItem;
     this.isKeyDownEnabled = true;
@@ -562,7 +504,6 @@ export default class SortableGroupModifier extends Modifier {
    * elements that aren't meant to invoke keyboard navigation
    * by ignoring them.
    */
-  @action
   deactivateKeyDown() {
     this.isKeyDownEnabled = false;
   }
@@ -572,7 +513,6 @@ export default class SortableGroupModifier extends Modifier {
    @method registerGroup
    @param {SortableGroupModifier} group
    */
-  @action
   registerGroup(group) {
     this._group = group;
   }
@@ -582,7 +522,6 @@ export default class SortableGroupModifier extends Modifier {
    @method deregisterGroup
    @param {SortableGroupModifier} group
    */
-  @action
   deregisterGroup(group) {
     if (this._group === group) {
       this._group = null;
@@ -595,7 +534,6 @@ export default class SortableGroupModifier extends Modifier {
    we don’t incur expensive re-layouts.
    @method _prepare
    */
-  @action
   prepare() {
     this._firstItemPosition = this.firstItemPosition;
   }
@@ -604,7 +542,6 @@ export default class SortableGroupModifier extends Modifier {
    Update item positions (relatively to the first element position).
    @method update
    */
-  @action
   update() {
     let sortedItems = this.sortedItems;
     // Position of the first element
@@ -614,11 +551,9 @@ export default class SortableGroupModifier extends Modifier {
     if (position === undefined) {
       position = this.firstItemPosition;
     }
-
-    sortedItems.forEach((item) => {
+    sortedItems.forEach(item => {
       let dimension;
       let direction = this.direction;
-
       if (!isDestroyed(item) && !item.isDragging) {
         set(item, direction, position);
       }
@@ -627,14 +562,12 @@ export default class SortableGroupModifier extends Modifier {
       if (item.isBusy) {
         position += item.spacing * 2;
       }
-
       if (direction === 'x') {
         dimension = 'width';
       }
       if (direction === 'y') {
         dimension = 'height';
       }
-
       position += item[dimension];
     });
   }
@@ -642,23 +575,18 @@ export default class SortableGroupModifier extends Modifier {
   /**
    @method _commit
    */
-  @action
   commit() {
     const items = this.sortedItems;
-    const itemModels = items.map((item) => item.model);
-    const draggedItem = items.find((item) => item.wasDropped);
+    const itemModels = items.map(item => item.model);
+    const draggedItem = items.find(item => item.wasDropped);
     let draggedModel;
-
     if (draggedItem) {
       draggedItem.wasDropped = false; // Reset
       draggedModel = draggedItem.model;
     }
-
     this._updateItems();
     this._onChange(itemModels, draggedModel);
   }
-
-  @action
   _onChange(itemModels, draggedModel) {
     if (this.onChange) {
       this.onChange(itemModels, draggedModel);
@@ -671,25 +599,19 @@ export default class SortableGroupModifier extends Modifier {
    */
   _updateItems() {
     const items = this.sortedItems;
-
     delete this._firstItemPosition;
-
     schedule('render', () => {
-      items.forEach((item) => item.freeze());
+      items.forEach(item => item.freeze());
     });
-
     schedule('afterRender', () => {
-      items.forEach((item) => item.reset());
+      items.forEach(item => item.reset());
     });
-
     next(() => {
       schedule('render', () => {
-        items.forEach((item) => item.thaw());
+        items.forEach(item => item.thaw());
       });
     });
   }
-
-  @action
   _createAnnouncer() {
     const announcer = document.createElement('span');
     announcer.setAttribute('aria-live', 'polite');
@@ -703,43 +625,51 @@ export default class SortableGroupModifier extends Modifier {
     this.element.addEventListener('keydown', this.keyDown);
     this.element.addEventListener('focusout', this.focusOut);
   }
-
   removeEventListener() {
     this.element.removeEventListener('keydown', this.keyDown);
     this.element.removeEventListener('focusout', this.focusOut);
   }
-
-  element;
-  didSetup = false;
-
   constructor(owner, args) {
     super(owner, args);
+    /** Primary keyboard utils */
+    // Tracks the currently selected item
+    _defineProperty(this, "_selectedItem", null);
+    // Tracks the current move
+    _defineProperty(this, "move", null);
+    _defineProperty(this, "moves", []);
+    // Tracks the status of keyboard reorder mode
+    _defineProperty(this, "isKeyboardReorderModeEnabled", false);
+    _defineProperty(this, "isKeyDownEnabled", false);
+    // Tracks if we're still performing a programmatic focus.
+    _defineProperty(this, "isRetainingFocus", false);
+    _initializerDefineProperty(this, "sortableService", _descriptor, this);
+    _defineProperty(this, "announcer", null);
+    _defineProperty(this, "element", void 0);
+    _defineProperty(this, "didSetup", false);
     registerDestructor(this, cleanup);
   }
-
   modify(element, _positional, named) {
     this.element = element;
     this.named = named;
-
     this.removeEventListener();
-
     if (!this.didSetup) {
       this._groupDef = this.sortableService.fetchGroup(this.groupName);
       this.announcer = this._createAnnouncer();
       this.element.insertAdjacentElement('afterend', this.announcer);
       this.sortableService.registerGroup(this.groupName, this);
-
       this.didSetup = true;
     }
-
     if (this.disabled) {
       return;
     }
-
     this.addEventListener();
   }
-}
-
+}, (_applyDecoratedDescriptor(_class.prototype, "focusOut", [action], Object.getOwnPropertyDescriptor(_class.prototype, "focusOut"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "keyDown", [action], Object.getOwnPropertyDescriptor(_class.prototype, "keyDown"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "cancelKeyboardSelection", [action], Object.getOwnPropertyDescriptor(_class.prototype, "cancelKeyboardSelection"), _class.prototype), _descriptor = _applyDecoratedDescriptor(_class.prototype, "sortableService", [_dec], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _applyDecoratedDescriptor(_class.prototype, "firstItemPosition", [_dec2], Object.getOwnPropertyDescriptor(_class.prototype, "firstItemPosition"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "activateKeyDown", [action], Object.getOwnPropertyDescriptor(_class.prototype, "activateKeyDown"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "deactivateKeyDown", [action], Object.getOwnPropertyDescriptor(_class.prototype, "deactivateKeyDown"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "registerGroup", [action], Object.getOwnPropertyDescriptor(_class.prototype, "registerGroup"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "deregisterGroup", [action], Object.getOwnPropertyDescriptor(_class.prototype, "deregisterGroup"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "prepare", [action], Object.getOwnPropertyDescriptor(_class.prototype, "prepare"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "update", [action], Object.getOwnPropertyDescriptor(_class.prototype, "update"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "commit", [action], Object.getOwnPropertyDescriptor(_class.prototype, "commit"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "_onChange", [action], Object.getOwnPropertyDescriptor(_class.prototype, "_onChange"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "_createAnnouncer", [action], Object.getOwnPropertyDescriptor(_class.prototype, "_createAnnouncer"), _class.prototype)), _class));
 /**
  *
  * @param {SortableGroupModifier} instance
@@ -752,3 +682,6 @@ function cleanup(instance) {
   instance.removeEventListener();
   instance.sortableService.deregisterGroup(instance.groupName, instance);
 }
+
+export { SortableGroupModifier as default };
+//# sourceMappingURL=sortable-group.js.map