Skip to content

fix: Do not override ember-modal-dialog components #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2025
Merged

fix: Do not override ember-modal-dialog components #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions addon/components/docs-header/search-results/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<div {{did-insert (perform this.search)}} {{did-update (perform this.search) @query}} ...attributes>
<div
{{did-insert (perform this.search)}}
{{did-update (perform this.search) @query}}
...attributes
>
{{#if (and this.trimmedQuery this.search.isIdle)}}
<ModalDialog
<DocsModalDialog
@tetherTarget="[data-search-box]"
@attachment="top left"
@clickOutsideToClose={{true}}
Expand Down Expand Up @@ -30,6 +34,6 @@
</li>
{{/each}}
</ul>
</ModalDialog>
</DocsModalDialog>
{{/if}}
</div>
4 changes: 2 additions & 2 deletions addon/components/docs-header/version-selector/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ModalDialog
<DocsModalDialog
@tetherTarget="[data-version-selector]"
@attachment="top right"
@clickOutsideToClose={{true}}
Expand Down Expand Up @@ -69,4 +69,4 @@
</li>
{{/each}}
</ul>
</ModalDialog>
</DocsModalDialog>
4 changes: 2 additions & 2 deletions addon/components/docs-keyboard-shortcuts/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#if this.isShowingKeyboardShortcuts}}
<ModalDialog
<DocsModalDialog
@animatable={{true}}
@overlay={{true}}
@wrapperClass="docs-fullscreen-modal docs-keyboard-shortcuts-modal modal-fade"
Expand Down Expand Up @@ -184,5 +184,5 @@
</tbody>
</table>
</div>
</ModalDialog>
</DocsModalDialog>
{{/if}}
0 addon/components/modal-dialog.js → addon/components/docs-modal-dialog.js
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions app/components/docs-modal-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'ember-cli-addon-docs/components/docs-modal-dialog';
1 change: 0 additions & 1 deletion app/components/modal-dialog.js
View file
Open in desktop

This file was deleted.