-
Notifications
You must be signed in to change notification settings - Fork 27
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.
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
Remove PublicationMenuComponent render modifiers #8264
Merged
dartajax
merged 5 commits into
ilios:master
from
michaelchadwick:remove-pub-menu-render-modifiers
Dec 16, 2024
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
49fa84c
removed render modifiers
michaelchadwick 3fa46c9
updated lint-todo
michaelchadwick e748a4b
refactor; remove console.log
michaelchadwick d3fcc0c
fix to use elem clicked instead of querying from doc root
michaelchadwick 640173d
fix to use elem clicked instead of querying from doc root
michaelchadwick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
204 changes: 99 additions & 105 deletions
204
packages/ilios-common/addon/components/course/publication-menu.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,107 +1,101 @@ | ||
| <div | ||
| role="menubar" | ||
| class="publication-menu {{this.publicationStatus}}" | ||
| data-test-course-publication-menu | ||
| {{on-click-outside (set this "isOpen" false)}} | ||
| > | ||
| <button | ||
| aria-label={{this.title}} | ||
| role="menuitem" | ||
| class="toggle" | ||
| aria-haspopup="true" | ||
| aria-expanded={{if this.isOpen "true" "false"}} | ||
| type="button" | ||
| data-test-toggle | ||
| {{on "click" (toggle "isOpen" this)}} | ||
| {{on "keyup" this.toggleMenu}} | ||
| {{#let (unique-id) as |templateId|}} | ||
| <div | ||
| role="menubar" | ||
| class="publication-menu {{this.publicationStatus}}" | ||
| id="menu-{{templateId}}" | ||
| data-test-course-publication-menu | ||
| {{on-click-outside (set this "isOpen" false)}} | ||
| > | ||
| <FaIcon @icon={{this.icon}} /> | ||
| <span> | ||
| {{this.title}} | ||
| </span> | ||
| <FaIcon @icon={{if this.isOpen "caret-down" "caret-right"}} /> | ||
| </button> | ||
| {{#if this.isOpen}} | ||
| <div | ||
| class="menu" | ||
| role="menu" | ||
| {{did-insert (set this "menuElement")}} | ||
| {{did-insert this.focusOnFirstItem}} | ||
| data-test-menu | ||
| <button | ||
| aria-label={{this.title}} | ||
| role="menuitem" | ||
| class="toggle" | ||
| aria-haspopup="true" | ||
| aria-expanded={{if this.isOpen "true" "false"}} | ||
| type="button" | ||
| data-test-toggle | ||
| {{on "keyup" this.keyUp}} | ||
| {{on "click" this.toggleMenu}} | ||
| > | ||
| {{#if this.showAsIs}} | ||
| <button | ||
| class="danger" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.publish}} | ||
| {{on "keyup" this.moveFocus}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-publish-as-is | ||
| > | ||
| {{t "general.publishAsIs"}} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showPublish}} | ||
| <button | ||
| class="good" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.publish}} | ||
| {{on "keyup" this.moveFocus}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-publish | ||
| > | ||
| {{t "general.publishCourse"}} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showReview}} | ||
| <button | ||
| class="good" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.scrollToCoursePublication}} | ||
| {{on "keyup" this.moveFocus}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-review | ||
| > | ||
| {{t | ||
| "general.reviewMissingItems" | ||
| count=(get @course "allPublicationIssuesLength") | ||
| }} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showTbd}} | ||
| <button | ||
| class="good" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.publishAsTbd}} | ||
| {{on "keyup" this.moveFocus}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-tbd | ||
| > | ||
| {{t "general.markAsScheduled"}} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showUnPublish}} | ||
| <button | ||
| class="danger" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.unpublish}} | ||
| {{on "keyup" this.moveFocus}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-un-publish | ||
| > | ||
| {{t "general.unPublishCourse"}} | ||
| </button> | ||
| {{/if}} | ||
| </div> | ||
| {{/if}} | ||
| </div> | ||
| <FaIcon @icon={{this.icon}} /> | ||
| <span> | ||
| {{this.title}} | ||
| </span> | ||
| <FaIcon @icon={{if this.isOpen "caret-down" "caret-right"}} /> | ||
| </button> | ||
| {{#if this.isOpen}} | ||
| <div class="menu" role="menu" data-test-menu {{focus}}> | ||
| {{#if this.showAsIs}} | ||
| <button | ||
| class="danger" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.publish}} | ||
| {{on "keyup" this.keyUp}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-publish-as-is | ||
| > | ||
| {{t "general.publishAsIs"}} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showPublish}} | ||
| <button | ||
| class="good" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.publish}} | ||
| {{on "keyup" this.keyUp}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-publish | ||
| > | ||
| {{t "general.publishCourse"}} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showReview}} | ||
| <button | ||
| class="good" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.scrollToCoursePublication}} | ||
| {{on "keyup" this.keyUp}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-review | ||
| > | ||
| {{t "general.reviewMissingItems" count=(get @course "allPublicationIssuesLength")}} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showTbd}} | ||
| <button | ||
| class="good" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.publishAsTbd}} | ||
| {{on "keyup" this.keyUp}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-tbd | ||
| > | ||
| {{t "general.markAsScheduled"}} | ||
| </button> | ||
| {{/if}} | ||
| {{#if this.showUnPublish}} | ||
| <button | ||
| class="danger" | ||
| role="menuitem" | ||
| tabindex="-1" | ||
| type="button" | ||
| {{on "click" this.unpublish}} | ||
| {{on "keyup" this.keyUp}} | ||
| {{on "mouseenter" this.clearFocus}} | ||
| data-test-un-publish | ||
| > | ||
| {{t "general.unPublishCourse"}} | ||
| </button> | ||
| {{/if}} | ||
| </div> | ||
| {{/if}} | ||
| </div> | ||
| {{/let}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this works since there's only ever one menu open at the same time.
however, querying from the doc root is brittle.
i'm suggesting bringing the menu element back as input argument, then making the DOM query from that element instead.
would require identifying the menu element from the event target in the click handler -for example, if the clicked element is nested within the menu ("menu item"), you'll have to traverse the DOM tree up from it.