Use ensure-safe-component for dynamic invocations

nickschot · Dec 30, 2023 · ffe795f · ffe795f
1 parent 9cf8fe6
commit ffe795f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/addon/components/model-select-multiple.hbs b/addon/components/model-select-multiple.hbs
@@ -73,7 +73,12 @@
   @eventType={{@eventType}}
   @title={{@title}}
   {{!-- @triggerClass="ember-power-select-multiple-trigger {{@triggerClass}}" --}}
-  @triggerComponent={{component (or @triggerComponent "power-select-multiple/trigger") tabindex=@tabindex}}
+  @triggerComponent={{
+    if
+      @triggerComponent
+      (component (ensure-safe-component @triggerComponent) tabindex=@tabindex)
+      (component "power-select-multiple/trigger" tabindex=@tabindex)
+  }}
   @triggerId={{@triggerId}}
   @verticalPosition={{@verticalPosition}}
   @tabindex={{this.computedTabIndex}}

diff --git a/addon/components/model-select.hbs b/addon/components/model-select.hbs
@@ -34,7 +34,7 @@
     @onOpen={{this.onOpen}}
     @options={{this._options}}
     @optionsComponent={{component
-      this.optionsComponent
+      (ensure-safe-component this.optionsComponent)
       infiniteScroll=this.infiniteScroll
       infiniteModel=this.model
       withCreate=this.withCreate}}
@@ -52,7 +52,7 @@
     @selectedItemComponent={{@selectedItemComponent}}
     @tabindex={{@tabindex}}
     @triggerClass={{@triggerClass}}
-    @triggerComponent={{@triggerComponent}}
+    @triggerComponent={{ensure-safe-component @triggerComponent}}
     @triggerId={{@triggerId}}
     @triggerRole={{@triggerRole}}
     @typeAheadMatcher={{@typeAheadMatcher}}

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "prepare": "node ./compile-css.js"
   },
   "dependencies": {
+    "@embroider/util": "^1.12.1",
     "@ember/test-waiters": "^2.4.5",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml