fix: cache config and forId

Also move default tabindex to hbs
knownasilya · Jan 13, 2022 · 9d6e79d · 9d6e79d
1 parent 455e49e
commit 9d6e79d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/addon/components/x-toggle.hbs b/addon/components/x-toggle.hbs
@@ -1,7 +1,6 @@
-{{! template-lint-disable no-positive-tabindex}}
 <div
   class='x-toggle-component {{if this.focused 'x-toggle-focused'}}'
-  tabindex={{this.tabindex}}
+  tabindex='0'
   ...attributes
   {{did-insert this.setContainer}}
   {{on 'focusin' this.handleFocusIn}}

diff --git a/addon/components/x-toggle.js b/addon/components/x-toggle.js
@@ -3,6 +3,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { getOwner } from '@ember/application';
 import { guidFor } from '@ember/object/internals';
+import { cached } from '@glimmer/tracking';
 
 function configValue(configName, defaultValue) {
   return function (target, name) {
@@ -22,7 +23,6 @@ export default class XToggle extends Component {
   @tracked focused = false;
 
   container;
-  tabindex = '0';
 
   @configValue(null, false) disabled;
   @configValue(null, false) value;
@@ -34,6 +34,7 @@ export default class XToggle extends Component {
   @configValue('defaultShowLabels', false) showLabels;
   @configValue('defaultSize', 'medium') size;
 
+  @cached
   get config() {
     return (
       getOwner(this).resolveRegistration('config:environment')[
@@ -46,6 +47,7 @@ export default class XToggle extends Component {
     return this.value;
   }
 
+  @cached
   get forId() {
     return guidFor(this) + '-x-toggle';
   }

diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "@ember/render-modifiers": "^2.0.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
+    "ember-cached-decorator-polyfill": "^0.1.4",
     "ember-gesture-modifiers": "^1.1.1"
   },
   "devDependencies": {

diff --git a/yarn.lock b/yarn.lock
@@ -5559,6 +5559,26 @@ ember-auto-import@^2.2.0, ember-auto-import@^2.2.4:
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^0.3.3"
 
+ember-cache-primitive-polyfill@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cache-primitive-polyfill/-/ember-cache-primitive-polyfill-1.0.1.tgz#a27075443bd87e5af286c1cd8a7df24e3b9f6715"
+  integrity sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-cli-version-checker "^5.1.1"
+    ember-compatibility-helpers "^1.2.1"
+    silent-error "^1.1.1"
+
+ember-cached-decorator-polyfill@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.4.tgz#f1e2c65cc78d0d9c4ac0e047e643af477eb85ace"
+  integrity sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA==
+  dependencies:
+    "@glimmer/tracking" "^1.0.4"
+    ember-cache-primitive-polyfill "^1.0.1"
+    ember-cli-babel "^7.21.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+
 ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
@@ -5597,7 +5617,7 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-
     rimraf "^3.0.1"
     semver "^5.5.0"
 
-ember-cli-babel@^7.26.11:
+ember-cli-babel@^7.21.0, ember-cli-babel@^7.26.11:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==