ember-sortable 2.3.0 → 2.4.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v2.4.0 (2021-11-10)
+
+#### :rocket: Enhancement
+* [#445](https://github.com/adopted-ember-addons/ember-sortable/pull/445) Use direct imports from `@ember/runloop` ([@charlesfries](https://github.com/charlesfries))
+
+#### Committers: 2
+- Charles Fries ([@charlesfries](https://github.com/charlesfries))
+- Faith Or ([@faith-or](https://github.com/faith-or))
+
 * Merge pull request #430 from jacojoubert/refactor-disabled (364fc80)
 *  (51ea46f)
 * Merge pull request #444 from snewcomer/sn/deprecate-components (b70d5cd)

package/addon/components/sortable-group.js

@@ -1,7 +1,7 @@
 import { A } from '@ember/array';
 import Component from '@ember/component';
 import { set, get, computed, defineProperty } from '@ember/object';
-import { run } from '@ember/runloop';
+import { next, schedule, scheduleOnce, later } from '@ember/runloop';
 import layout from '../templates/components/sortable-group';
 import {
   isEnterKey,
@@ -183,7 +183,7 @@ export default Component.extend({
 
       this.set('isRetainingFocus', true);
 
-      run.scheduleOnce('render', () => {
+      scheduleOnce('render', () => {
         this.element.focus();
         this.set('isRetainingFocus', false);
       });
@@ -234,7 +234,7 @@ export default Component.extend({
     }
     this._announceAction(ANNOUNCEMENT_ACTION_TYPES.MOVE, delta);
     // Guarantees that the before the UI is fully rendered before we move again.
-    run.scheduleOnce('render', () => {
+    scheduleOnce('render', () => {
       this._move(sortedIndex, newSortedIndex);
       this._updateHandleVisualIndicators(item, true);
 
@@ -411,16 +411,16 @@ export default Component.extend({
 
     delete this._itemPosition;
 
-    run.schedule('render', () => {
+    schedule('render', () => {
       items.invoke('freeze');
     });
 
-    run.schedule('afterRender', () => {
+    schedule('afterRender', () => {
       items.invoke('reset');
     });
 
-    run.next(() => {
-      run.schedule('render', () => {
+    next(() => {
+      schedule('render', () => {
         items.invoke('thaw');
       });
     });
@@ -480,7 +480,7 @@ export default Component.extend({
       this.confirmKeyboardSelection();
 
       this.set('isRetainingFocus', true);
-      run.scheduleOnce('render', () => this._focusItem(itemElement));
+      scheduleOnce('render', () => this._focusItem(itemElement));
     } else if (isEscapeKey(event)) {
       // cancel will reset the _selectedItem, so caching it here before we remove it.
       const _selectedItemElement = this.get('_selectedItem.element');
@@ -488,7 +488,7 @@ export default Component.extend({
       this.cancelKeyboardSelection();
 
       this.set('isRetainingFocus', true);
-      run.scheduleOnce('render', () => {
+      scheduleOnce('render', () => {
         const moves = this.get('moves');
         if (moves && moves.length > 0) {
           const sortedItems = this.get('sortedItems');
@@ -582,7 +582,7 @@ export default Component.extend({
     announcer.textContent = message;
 
     // Reset the message after the message is announced.
-    run.later(() => {
+    later(() => {
       announcer.textContent = '';
     }, 1000);
   },

package/addon/components/sortable-item.js

@@ -2,7 +2,7 @@ import { Promise, defer } from 'rsvp';
 import Component from '@ember/component';
 import { defineProperty } from '@ember/object';
 import { or, readOnly } from '@ember/object/computed';
-import { run, throttle } from '@ember/runloop';
+import { run, throttle, bind, scheduleOnce, later } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import scrollParent from '../system/scroll-parent';
 import ScrollContainer from '../system/scroll-container';
@@ -297,7 +297,7 @@ export default Component.extend({
     startEvent.preventDefault();
     startEvent.stopPropagation();
 
-    this._prepareDragListener = run.bind(this, this._prepareDrag, startEvent);
+    this._prepareDragListener = bind(this, this._prepareDrag, startEvent);
 
     DRAG_ACTIONS.forEach(event => window.addEventListener(event, this._prepareDragListener));
 
@@ -507,7 +507,7 @@ export default Component.extend({
     @private
   */
   _scheduleApplyPosition() {
-    run.scheduleOnce('render', this, '_applyPosition');
+    scheduleOnce('render', this, '_applyPosition');
   },
 
   /**
@@ -617,7 +617,7 @@ export default Component.extend({
       });
     } else {
       const duration = this.get('isAnimated') ? this.get('transitionDuration') : 200;
-      transitionPromise = new Promise((resolve) => run.later(resolve, duration));
+      transitionPromise = new Promise((resolve) => later(resolve, duration));
     }
 
     if (DEBUG) {

package/addon/modifiers/sortable-group.js

@@ -11,7 +11,7 @@ import {
 } from "../utils/keyboard";
 import {ANNOUNCEMENT_ACTION_TYPES} from "../utils/constant";
 import { defaultA11yAnnouncementConfig } from "../utils/defaults";
-import { run } from '@ember/runloop';
+import { next, schedule, scheduleOnce, later } from '@ember/runloop';
 import {inject as service} from '@ember/service';
 
 const NO_MODEL = {};
@@ -140,7 +140,7 @@ export default class SortableGroupModifier extends Modifier {
 
       this.isRetainingFocus = true;
 
-      run.scheduleOnce('render', () => {
+      scheduleOnce('render', () => {
         this.element.focus();
         this.isRetainingFocus = false;
       });
@@ -221,7 +221,7 @@ export default class SortableGroupModifier extends Modifier {
       this.confirmKeyboardSelection();
 
       this.isRetainingFocus = true;
-      run.scheduleOnce('render', () => this._focusItem(itemElement));
+      scheduleOnce('render', () => this._focusItem(itemElement));
     } else if (isEscapeKey(event)) {
       // cancel will reset the selectedItem, so caching it here before we remove it.
       const _selectedItemElement = selectedItem.element;
@@ -229,7 +229,7 @@ export default class SortableGroupModifier extends Modifier {
       this.cancelKeyboardSelection();
 
       this.isRetainingFocus = true;
-      run.scheduleOnce('render', () => {
+      scheduleOnce('render', () => {
         const moves = this.moves;
         if (moves && moves.length > 0) {
           const sortedItems = this.sortedItems;
@@ -262,7 +262,7 @@ export default class SortableGroupModifier extends Modifier {
     }
     this._announceAction(ANNOUNCEMENT_ACTION_TYPES.MOVE, delta);
     // Guarantees that the before the UI is fully rendered before we move again.
-    run.scheduleOnce('render', () => {
+    scheduleOnce('render', () => {
       this._move(sortedIndex, newSortedIndex);
       this._updateHandleVisualIndicators(item, true);
 
@@ -344,7 +344,7 @@ export default class SortableGroupModifier extends Modifier {
     announcer.textContent = message;
 
     // Reset the message after the message is announced.
-    run.later(() => {
+    later(() => {
       announcer.textContent = '';
     }, 1000);
   }
@@ -675,16 +675,16 @@ export default class SortableGroupModifier extends Modifier {
 
     delete this._firstItemPosition;
 
-    run.schedule('render', () => {
+    schedule('render', () => {
       items.forEach(item => item.freeze());
     });
 
-    run.schedule('afterRender', () => {
+    schedule('afterRender', () => {
       items.forEach(item => item.reset());
     });
 
-    run.next(() => {
-      run.schedule('render', () => {
+    next(() => {
+      schedule('render', () => {
         items.forEach(item => item.thaw());
       });
     });

package/addon/modifiers/sortable-item.js

@@ -4,7 +4,7 @@ import {action, set} from '@ember/object';
 import {reads} from '@ember/object/computed';
 import {or} from '@ember/object/computed';
 import {DRAG_ACTIONS, ELEMENT_CLICK_ACTION, END_ACTIONS} from "../utils/constant";
-import { run, throttle } from '@ember/runloop';
+import { run, throttle, bind, scheduleOnce, later } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import {getX, getY} from "../utils/coordinate";
 import ScrollContainer from "../system/scroll-container";
@@ -321,7 +321,7 @@ export default class SortableItemModifier extends Modifier {
     startEvent.preventDefault();
     startEvent.stopPropagation();
 
-    this._prepareDragListener = run.bind(this, this._prepareDrag, startEvent);
+    this._prepareDragListener = bind(this, this._prepareDrag, startEvent);
 
     DRAG_ACTIONS.forEach(event => window.addEventListener(event, this._prepareDragListener));
 
@@ -528,7 +528,7 @@ export default class SortableItemModifier extends Modifier {
    @private
    */
   _scheduleApplyPosition() {
-    run.scheduleOnce('render', this, '_applyPosition');
+    scheduleOnce('render', this, '_applyPosition');
   }
 
   /**
@@ -638,7 +638,7 @@ export default class SortableItemModifier extends Modifier {
       });
     } else {
       const duration = this.isAnimated ? this.transitionDuration : 200;
-      transitionPromise = new Promise((resolve) => run.later(resolve, duration));
+      transitionPromise = new Promise((resolve) => later(resolve, duration));
     }
 
     if (DEBUG) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-sortable",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Sortable UI primitives for Ember.",
   "keywords": [
     "ember-addon",