fix paper-input not clearing text

miguelcobain · Jul 25, 2019 · f117ca0 · f117ca0
1 parent edf651d
commit f117ca0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/addon/components/paper-autocomplete-trigger.js b/addon/components/paper-autocomplete-trigger.js
@@ -5,6 +5,7 @@ import Component from '@ember/component';
 import { not } from '@ember/object/computed';
 import { computed } from '@ember/object';
 import layout from '../templates/components/paper-autocomplete-trigger';
+import unwrapProxy from 'ember-paper/utils/unwrap-proxy';
 
 /**
  * @class PaperAutocompleteTrigger
@@ -26,7 +27,7 @@ export default Component.extend({
   }),
 
   text: computed('select.{searchText,selected}', function() {
-    let selected = this.get('select.selected');
+    let selected = unwrapProxy(this.get('select.selected'));
     if (selected) {
       return this.getSelectedAsText();
     }

diff --git a/addon/components/paper-input.js b/addon/components/paper-input.js
@@ -163,7 +163,7 @@ export default Component.extend(FocusableMixin, ColorMixin, ChildMixin, Validati
     // normalize falsy values to empty string
     value = isEmpty(value) ? '' : value;
 
-    if (this.element.querySelector('input, textarea').value !== value && value) {
+    if (this.element.querySelector('input, textarea').value !== value) {
       this.element.querySelector('input, textarea').value = value;
     }
   },

diff --git a/addon/utils/unwrap-proxy.js b/addon/utils/unwrap-proxy.js
@@ -0,0 +1,11 @@
+import ArrayProxy from '@ember/array/proxy';
+import ObjectProxy from '@ember/object/proxy';
+import { get } from '@ember/object';
+
+export default function unwrapProxy(o) {
+  return isProxy(o) ? unwrapProxy(get(o, 'content')) : o;
+}
+
+export function isProxy(o) {
+  return !!(o && (o instanceof ObjectProxy || o instanceof ArrayProxy));
+}