-
Notifications
You must be signed in to change notification settings - Fork 28
Updating package-lock.json #4957
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
Changes from 4 commits
6e691a2
d129643
fa8c6da
9164c99
ef820a3
ea3b117
ab20122
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| "browsers": [ | ||
| { | ||
| "name": "Chromium", | ||
| "version": 128 | ||
| "version": 129 | ||
| } | ||
| ] | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -214,7 +214,6 @@ class DialogFullscreen extends LocalizeCoreElement(AsyncContainerMixin(DialogMix | |
| } | ||
|
|
||
| render() { | ||
| this._width = Math.max(1170, this.width); | ||
| const heightOverride = {} ; | ||
| let topOverride = null; | ||
| if (this._ifrauContextInfo) { | ||
|
|
@@ -251,7 +250,6 @@ class DialogFullscreen extends LocalizeCoreElement(AsyncContainerMixin(DialogMix | |
| <div style=${styleMap(slotStyles)}><slot></slot></div> | ||
| `; | ||
|
|
||
| if (!this._titleId) this._titleId = getUniqueId(); | ||
| const inner = html` | ||
| <div class="d2l-dialog-inner" style=${styleMap(heightOverride)}> | ||
| <div class="d2l-dialog-header"> | ||
|
|
@@ -286,6 +284,12 @@ class DialogFullscreen extends LocalizeCoreElement(AsyncContainerMixin(DialogMix | |
| } | ||
| } | ||
|
|
||
| willUpdate(changedProperties) { | ||
| super.willUpdate(changedProperties); | ||
| this._width = Math.max(1170, this.width); | ||
|
||
| if (!this._titleId) this._titleId = getUniqueId(); | ||
| } | ||
|
|
||
| _abort() { | ||
| this._close('abort'); | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -158,7 +158,6 @@ class Dialog extends LocalizeCoreElement(AsyncContainerMixin(DialogMixin(LitElem | |
| 'd2l-footer-no-content': !this._hasFooterContent | ||
| }; | ||
|
|
||
| if (!this._textId && this.describeContent) this._textId = getUniqueId(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Again, I think we should just always set |
||
| const content = html` | ||
| ${loading} | ||
| <div id="${ifDefined(this._textId)}" style=${styleMap(slotStyles)}><slot></slot></div> | ||
|
|
@@ -202,6 +201,11 @@ class Dialog extends LocalizeCoreElement(AsyncContainerMixin(DialogMixin(LitElem | |
| } | ||
| } | ||
|
|
||
| willUpdate(changedProperties) { | ||
| super.willUpdate(changedProperties); | ||
| if (!this._textId && this.describeContent) this._textId = getUniqueId(); | ||
| } | ||
|
|
||
| _abort() { | ||
| this._close('abort'); | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -178,6 +178,11 @@ class InputDate extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixin( | |||||||||
| return 'd2l-input-text'; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| /** @ignore */ | ||||||||||
| get inputTextWidth() { | ||||||||||
| return `calc(${this._hiddenContentWidth} + 0.75rem + 3px)`; // text and icon width + paddingRight + border width + 1 | ||||||||||
| } | ||||||||||
|
|
||||||||||
| /** @ignore */ | ||||||||||
| get validationMessage() { | ||||||||||
| if (this.validity.rangeOverflow || this.validity.rangeUnderflow) { | ||||||||||
|
|
@@ -238,9 +243,7 @@ class InputDate extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixin( | |||||||||
|
|
||||||||||
| render() { | ||||||||||
| const formattedWideDate = formatISODateInUserCalDescriptor('2323-12-23'); | ||||||||||
| const inputTextWidth = `calc(${this._hiddenContentWidth} + 0.75rem + 3px)`; // text and icon width + paddingRight + border width + 1 | ||||||||||
| const shortDateFormat = (this._dateTimeDescriptor.formats.dateFormats.short).toUpperCase(); | ||||||||||
| this.style.maxWidth = inputTextWidth; | ||||||||||
|
|
||||||||||
| const clearButton = !this.required ? html`<d2l-button-subtle text="${this.localize(`${this._namespace}.clear`)}" @click="${this._handleClear}"></d2l-button-subtle>` : null; | ||||||||||
| const nowButton = this.hasNow ? html`<d2l-button-subtle text="${this.localize(`${this._namespace}.now`)}" @click="${this._handleSetToNow}"></d2l-button-subtle>` : null; | ||||||||||
|
|
@@ -304,7 +307,7 @@ class InputDate extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixin( | |||||||||
| placeholder="${shortDateFormat}" | ||||||||||
| ?required="${this.required}" | ||||||||||
| ?skeleton="${this.skeleton}" | ||||||||||
| style="${styleMap({ maxWidth: inputTextWidth })}" | ||||||||||
| style="${styleMap({ maxWidth: this.inputTextWidth })}" | ||||||||||
| .value="${this._formattedValue}"> | ||||||||||
| ${icon} | ||||||||||
| <slot slot="inline-help" name="inline-help"></slot> | ||||||||||
|
|
@@ -339,6 +342,11 @@ class InputDate extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixin( | |||||||||
| }); | ||||||||||
| } | ||||||||||
|
|
||||||||||
| willUpdate(changedProperties) { | ||||||||||
| super.willUpdate(changedProperties); | ||||||||||
| this.style.maxWidth = this.inputTextWidth; | ||||||||||
|
||||||||||
| this.style.maxWidth = this.inputTextWidth; | |
| if (changedProperties.has('_hiddenContentWidth')) { | |
| this.style.maxWidth = this.inputTextWidth; | |
| } |
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -329,11 +329,9 @@ class InputTime extends InputInlineHelpMixin(FocusMixin(LabelledMixin(SkeletonMi | |||||||
| `)}` : null; | ||||||||
| const formattedWideTimeAM = formatTime(new Date(2020, 0, 1, 10, 23, 0)); | ||||||||
| const formattedWideTimePM = formatTime(new Date(2020, 0, 1, 23, 23, 0)); | ||||||||
| const inputTextWidth = `calc(${this._hiddenContentWidth} + 1.5rem + 3px)`; // text and icon width + left & right padding + border width + 1 | ||||||||
| const opened = this.opened && !this.disabled && !this.skeleton; | ||||||||
| const dropdownIdTimezone = `${this._dropdownId}-timezone`; | ||||||||
| const ariaDescribedByIds = `${this._dropdownId ? dropdownIdTimezone : ''} ${this._hasInlineHelp ? this._inlineHelpId : ''}`.trim(); | ||||||||
| this.style.maxWidth = inputTextWidth; | ||||||||
|
|
||||||||
| return html` | ||||||||
| <div aria-hidden="true" class="d2l-input-time-hidden-content"> | ||||||||
|
|
@@ -393,6 +391,12 @@ class InputTime extends InputInlineHelpMixin(FocusMixin(LabelledMixin(SkeletonMi | |||||||
| }); | ||||||||
| } | ||||||||
|
|
||||||||
| willUpdate(changedProperties) { | ||||||||
| super.willUpdate(changedProperties); | ||||||||
| const inputTextWidth = `calc(${this._hiddenContentWidth} + 1.5rem + 3px)`; // text and icon width + left & right padding + border width + 1 | ||||||||
| this.style.maxWidth = inputTextWidth; | ||||||||
|
||||||||
| const inputTextWidth = `calc(${this._hiddenContentWidth} + 1.5rem + 3px)`; // text and icon width + left & right padding + border width + 1 | |
| this.style.maxWidth = inputTextWidth; | |
| this.style.maxWidth = `calc(${this._hiddenContentWidth} + 1.5rem + 3px)`; // text and icon width + left & right padding + border width + 1; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,8 +36,9 @@ export class SkeletonTestLink extends SkeletonMixin(LitElement) { | |
| 'd2l-link-small': this.type === 'small', | ||
| 'd2l-skeletize': true | ||
| }; | ||
| const widthSkeletonSize = `d2l-skeletize-${this.width}`; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Interesting... so the new linting rules hated just referencing
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. My theory is that there is an error in some regex, any reference to |
||
| if (this.width !== undefined) { | ||
| classes[`d2l-skeletize-${this.width}`] = true; | ||
| classes[widthSkeletonSize] = true; | ||
| } | ||
| return html`<a href="https://d2l.com" class="${classMap(classes)}">Link (${this.type})</a>`; | ||
| } | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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.
I think we should just set
this._titleId = getUniqueId()in the constructor. We do this already in a bunch of places, and it would avoid needing to do it inwillUpdate.