Merge branch 'master' into refactor-disabled

CHANGELOG.md

@@ -1,3 +1,8 @@
+* updated yarn.lock (ca925fa)
+* Fix deprecation warning `Importing from ember-test-waiters is deprecated` (#423) (f817c5d)
+* Require ember-decorators-polyfill to be installed by client app (#425) (f901543)
+* Set default values for itemVisualClass  and a11yAnnouncementConfig (#424) (436b7ac)
+
 * update yarn.lock (a18d3cb)
 * bump ember-get-config to version using babel v7 (#416) (92dd9b9)
 

README.md

@@ -42,16 +42,16 @@ $ ember install ember-sortable
 ```hbs
 {{! app/templates/my-route.hbs }}
 
-{{#sortable-group model=model.items onChange=(action "reorderItems") as |group|}}
+<SortableGroup @model={{this.model.items}} @onChange={{this.reorderItems}} as |group|}}
   {{#each group.model as |modelItem|}}
-    {{#group.item model=modelItem as |item|}}
+    <group.item @model={{modelItem}} as |item|}}
       {{modelItem.name}}
-      {{#item.handle}}
+      <item.handle>
         <span class="handle">&varr;</span>
-      {{/item.handle}}
-    {{/group.item}}
+      </item.handle>
+    </group.item>
   {{/each}}
-{{/sortable-group}}
+</SortableGroup>
 ```
 
 ### modifier

addon/components/sortable-item.js

@@ -1,6 +1,7 @@
 import { Promise, defer } from 'rsvp';
 import Component from '@ember/component';
-import { computed, defineProperty } from '@ember/object';
+import { defineProperty } from '@ember/object';
+import { or, readOnly } from '@ember/object/computed';
 import { run, throttle } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import scrollParent from '../system/scroll-parent';
@@ -118,7 +119,7 @@ export default Component.extend({
     @property isBusy
     @type Boolean
   */
-  isBusy: computed.or('isDragging', 'isDropping'),
+  isBusy: or('isDragging', 'isDropping'),
 
   /**
     The frequency with which the group is informed
@@ -158,7 +159,7 @@ export default Component.extend({
     Allows host instance to use the `group` property for something else with
     minimal overriding.
   */
-  _direction: computed.readOnly('direction'),
+  _direction: readOnly('direction'),
 
 
   disableCheckScrollBounds: isTesting,

addon/modifiers/sortable-item.js

@@ -649,7 +649,7 @@ export default class SortableItemModifier extends Modifier {
 
   get isAnimated() {
     if (!this.element) {
-      return;
+      return undefined;
     }
 
     let el = this.element;

addon/templates/components/sortable-group.hbs

@@ -1,7 +1,7 @@
 {{yield (
   hash
     item=(component "ember-sortable@sortable-item"
-      direction=direction
+      direction=this.direction
       registerItem=(action "registerItem")
       deregisterItem=(action "deregisterItem")
       setSelectedItem=(action "setSelectedItem")
@@ -11,6 +11,6 @@
       activateKeyDown=(action "activateKeyDown")
       deactivateKeyDown=(action "deactivateKeyDown")
     )
-    model=model
+    model=this.model
   )
 }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-sortable",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "Sortable UI primitives for Ember.",
   "keywords": [
     "ember-addon",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@ember/render-modifiers": "^1.0.2",
     "@ember/test-waiters": "^2.4.4",
-    "ember-cli-babel": "^7.11.1",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.0.0",
     "ember-cli-version-checker": "^5.1.2",
     "ember-get-config": "^0.3.0",