fix: backwards compatibility with ember-source <3.27

prysmex · Feb 10, 2022 · f3d07b2 · f3d07b2
1 parent b8340ca
commit f3d07b2
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/packages/core/addon/components/eui-button-content/index.hbs b/packages/core/addon/components/eui-button-content/index.hbs
@@ -13,6 +13,7 @@
       @type={{@iconType}}
       @size="m"
       @useSvg={{@useSvg}}
+      @useComponent={{@useComponent}}
     />
   {{/if}}
   <span class={{@textClasses}}>

diff --git a/packages/core/addon/components/eui-button-empty/index.hbs b/packages/core/addon/components/eui-button-empty/index.hbs
@@ -18,6 +18,7 @@
       @iconSide={{@iconSide}}
       @iconClasses={{@iconClasses}}
       @useSvg={{@useSvg}}
+      @useComponent={{@useComponent}}
       @textClasses={{class-names "euiButtonEmpty__text" @textClasses}}
     >
       {{yield}}
@@ -44,6 +45,7 @@
       @iconSide={{@iconSide}}
       @iconClasses={{@iconClasses}}
       @useSvg={{@useSvg}}
+      @useComponent={{@useComponent}}
       @textClasses={{class-names "euiButtonEmpty__text" @textClasses}}
     >
       {{yield}}

diff --git a/packages/core/addon/components/eui-button-icon/index.hbs b/packages/core/addon/components/eui-button-icon/index.hbs
@@ -11,6 +11,7 @@
         @type={{@iconType}}
         @size={{arg-or-default @iconSize "m"}}
         @useSvg={{@useSvg}}
+        @useComponent={{@useComponent}}
         aria-hidden="true"
       />
     {{/if}}
@@ -29,6 +30,7 @@
         @type={{@iconType}}
         @size={{@iconSize}}
         @useSvg={{@useSvg}}
+        @useComponent={{@useComponent}}
         aria-hidden="true"
       />
     {{/if}}

diff --git a/packages/core/addon/components/eui-button/index.hbs b/packages/core/addon/components/eui-button/index.hbs
@@ -21,6 +21,7 @@
       @iconSide={{@iconSide}}
       @iconClasses={{@iconClasses}}
       @useSvg={{@useSvg}}
+      @useComponent={{@useComponent}}
       @textClasses={{class-names "euiButton__text" @textClasses}}
     >
       {{yield}}
@@ -48,6 +49,7 @@
       @iconSide={{@iconSide}}
       @iconClasses={{@iconClasses}}
       @useSvg={{@useSvg}}
+      @useComponent={{@useComponent}}
       @textClasses={{class-names "euiButton__text" @textClasses}}
     >
       {{yield}}

diff --git a/packages/core/addon/components/eui-icon/index.hbs b/packages/core/addon/components/eui-icon/index.hbs
@@ -1,4 +1,4 @@
-{{#if this.icon.moduleName}}
+{{#if @useComponent}}
   {{! has the shape of a curried component }}
   {{#let (component this.icon) as |IconComponent|}}
     {{!template-lint-disable}}

diff --git a/packages/core/addon/components/eui-markdown-editor-footer/index.hbs b/packages/core/addon/components/eui-markdown-editor-footer/index.hbs
@@ -5,6 +5,7 @@
       {{! pending implementation}}
       <EuiButtonIcon
         @iconType={{component "eui-loading-spinner"}}
+        @useComponent={{true}}
         {{! aria-label={ariaLabels.uploadingFiles} }}
       />
     {{/if}}
@@ -29,7 +30,8 @@
   </div>
   <EuiButtonIcon
     class="euiMarkdownEditorFooter__help"
-    @iconType={{this.markdownLogo}}
+    @iconType={{component "eui-markdown-editor-footer/icons/markdown-logo"}}
+    @useComponent={{true}}
     @color="text"
     @useSvg={{true}}
     {{! aria-label={ariaLabels.showMarkdownHelp} }}

diff --git a/packages/core/addon/components/eui-markdown-editor-footer/index.ts b/packages/core/addon/components/eui-markdown-editor-footer/index.ts
@@ -1,14 +1,9 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import MarkdownLogoComponent from './icons/markdown-logo';
 
 export interface EuiMarkdownEditorFooterArgs {}
 
 export default class EuiMarkdownEditorFooterComponent extends Component<EuiMarkdownEditorFooterArgs> {
   @tracked isPopoverOpen = false;
   @tracked isShowingHelp = false;
-
-  get markdownLogo() {
-    return MarkdownLogoComponent;
-  }
 }
diff --git a/packages/core/addon/components/eui-markdown-editor-toolbar/index.hbs b/packages/core/addon/components/eui-markdown-editor-toolbar/index.hbs
@@ -18,7 +18,12 @@
         <EuiButtonIcon
           @color="text"
           {{on "click" (fn this.handleMdButtonClick item.id)}}
-          @iconType={{item.iconType}}
+          @iconType={{if
+            item.iconType.component
+            (component item.iconType.component)
+            item.iconType
+          }}
+          @useComponent={{item.iconType.component}}
           aria-label={{item.label}}
           @useSvg={{item.useSvg}}
           @isDisabled={{this.isPreviewing}}

diff --git a/packages/core/addon/components/eui-markdown-editor-toolbar/index.ts b/packages/core/addon/components/eui-markdown-editor-toolbar/index.ts
@@ -3,7 +3,6 @@ import { action } from '@ember/object';
 import type MarkdownActions from '../../utils/markdown/markdown-actions';
 import { MODE_VIEWING } from '../../utils/markdown/markdown-modes';
 import { cached } from '@glimmer/tracking';
-import MarkdownCheckmarkComponent from './icons/markdown-checkmark';
 
 import { Plugin } from 'unified';
 
@@ -50,7 +49,10 @@ export default class EuiMarkdownEditorToolbarComponent extends Component<EuiMark
         label: 'Task list',
         name: 'tl',
         useSvg: true,
-        iconType: MarkdownCheckmarkComponent
+        iconType: {
+          // this should't be needed when we drop support for 3.24.0
+          component: 'eui-markdown-editor-toolbar/icons/markdown-checkmark'
+        }
       }
     ];
   }