Skip to content

Commit f1b33e2

Browse files
authored
Merge pull request #405 from yapplabs/glimmer-overlay
Move Overlay component to Glimmer
2 parents 4adfc99 + 1f9d126 commit f1b33e2

File tree

7 files changed

+34
-57
lines changed

7 files changed

+34
-57
lines changed

addon/components/overlay.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

addon/components/overlay/index.hbs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div
2+
class={{this.cssClasses}}
3+
tabindex='-1'
4+
data-emd-overlay
5+
{{on 'click' this.handleClick}}
6+
...attributes
7+
>
8+
{{yield}}
9+
</div>

addon/components/overlay/index.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Component from '@glimmer/component';
2+
import { isIOS } from '../../utils/config-utils';
3+
import { htmlSafe } from '@ember/template';
4+
5+
export default class OverlayComponent extends Component {
6+
get cssClasses() {
7+
return htmlSafe(`emd-debug ${isIOS ? 'pointer-cursor' : ''}`);
8+
}
9+
handleClick = (event) => {
10+
this.args.onClickOverlay?.(event);
11+
};
12+
}

addon/templates/components/overlay.hbs

Lines changed: 0 additions & 10 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"devDependencies": {
4141
"@ember/jquery": "^2.0.0",
4242
"@ember/optional-features": "^2.0.0",
43+
"@ember/string": "^3.0.0",
4344
"@ember/test-helpers": "^2.6.0",
4445
"@embroider/test-setup": "^1.0.0",
4546
"@glimmer/component": "^1.1.2",
@@ -85,7 +86,6 @@
8586
"webpack": "^5.67.0"
8687
},
8788
"peerDependencies": {
88-
"@ember/render-modifiers": "^2.1.0",
8989
"@ember/string": "^3.0.0 || ^4.0.0",
9090
"ember-tether": "^3.0.0",
9191
"liquid-tether": "^2.0.7",

pnpm-lock.yaml

Lines changed: 11 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/dummy/app/helpers/lorem-ipsum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { helper } from '@ember/component/helper';
2-
import { htmlSafe } from '@ember/string';
2+
import { htmlSafe } from '@ember/template';
33

44
let originalText =
55
'Lorem ipsum dolor sit amet, consectetur adipiscing elit, ' +

0 commit comments

Comments
 (0)