Skip to content

🐛 [amp story] Change toggleAttribute to set/removeAttribute #37420

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
processprocess merged 6 commits into from
Jan 20, 2022
Merged

🐛 [amp story] Change toggleAttribute to set/removeAttribute #37420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6251fd3
set and remove attribute
processprocess Jan 19, 2022
d0a0fc5
remove toggle
processprocess Jan 19, 2022
c2b9efb
Use toggleAttribute utility.
processprocess Jan 19, 2022
870bc46
Add toggleAttribute to forbidden terms
processprocess Jan 19, 2022
476c668
Merge branch 'main' into attribute
processprocess Jan 20, 2022
b2a316d
Refactor toggle attribute.
processprocess Jan 20, 2022
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
1 change: 1 addition & 0 deletions build-system/test-configs/forbidden-terms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ const forbiddenTermsSrcInclusive = {
'\\.pageXOffset(?!_)': bannedTermsHelpString,
'\\.pageYOffset(?!_)': bannedTermsHelpString,
'\\.innerWidth(?!_)': bannedTermsHelpString,
'\\.toggleAttribute(?!_)': 'please use `toggleAttribute()` from core/dom',
Copy link
Copy Markdown
Contributor Author

@processprocess processprocess Jan 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jridgewell I feel like we should add this to forbidden terms to prevent future errors. WDYT?

Copy link
Copy Markdown
Contributor

@jridgewell jridgewell Jan 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM.

'\\.innerHeight(?!_)': bannedTermsHelpString,
'\\.scrollingElement(?!_)': bannedTermsHelpString,
'\\.computeCTM(?!_)': bannedTermsHelpString,
Expand Down
3 changes: 2 additions & 1 deletion extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {toggleAttribute} from '#core/dom';
import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
import {observeContentSize} from '#core/dom/layout/size-observer';
import {closest} from '#core/dom/query';
Expand Down Expand Up @@ -828,7 +829,7 @@ export class AmpStoryDevToolsTabPreview extends AMP.BaseElement {
const isEnabled =
(currentDeviceSpaces + spaces <= MAX_DEVICE_SPACES) |
!chipEl.hasAttribute('inactive');
chipEl.toggleAttribute('disabled', !isEnabled);
toggleAttribute(chipEl, 'disabled', !isEnabled);
});
}
}
10 changes: 6 additions & 4 deletions extensions/amp-story-dev-tools/0.1/amp-story-dev-tools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {toggleAttribute} from '#core/dom';
import {htmlFor} from '#core/dom/static-template';
import {toggle} from '#core/dom/style';
import {parseQueryString} from '#core/types/string/url';
Expand Down Expand Up @@ -215,12 +216,13 @@ export class AmpStoryDevTools extends AMP.BaseElement {
this.mutateElement(() => {
toggle(this.tabContents_[this.currentTab_], false);
toggle(this.tabContents_[tab], true);
this.tabSelectors_.forEach((tabSelector) => {
return tabSelector.toggleAttribute(
this.tabSelectors_.forEach((tabSelector) =>
toggleAttribute(
tabSelector,
'active',
tabSelector.getAttribute('data-tab') === tab
);
});
)
);
this.currentTab_ = tab;
});
}
Expand Down
3 changes: 2 additions & 1 deletion extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {devAssert} from '#core/assert';
import {toggleAttribute} from '#core/dom';
import {isAmpElement} from '#core/dom/amp-element-helpers';
import * as Preact from '#core/dom/jsx';
import {Layout_Enum} from '#core/dom/layout';
Expand Down Expand Up @@ -237,7 +238,7 @@ export class DraggableDrawer extends AMP.BaseElement {
? this.startListeningForTouchEvents_()
: this.stopListeningForTouchEvents_();

this.headerEl.toggleAttribute('desktop', !isMobile);
toggleAttribute(this.headerEl, 'desktop', !isMobile);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp-story/1.0/amp-story-embedded-component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {tryFocus} from '#core/dom';
import {toggleAttribute, tryFocus} from '#core/dom';
import * as Preact from '#core/dom/jsx';
import {closest, matches} from '#core/dom/query';
import {resetStyles, setImportantStyles} from '#core/dom/style';
Expand Down Expand Up @@ -398,7 +398,7 @@ export class AmpStoryEmbeddedComponent {
UIType.DESKTOP_FULLBLEED,
UIType.DESKTOP_ONE_PANEL,
].includes(uiState);
this.focusedStateOverlay_.toggleAttribute('desktop', isDesktop);
toggleAttribute(this.focusedStateOverlay_, 'desktop', isDesktop);
}
);
}
Expand Down
6 changes: 3 additions & 3 deletions extensions/amp-story/1.0/pagination-buttons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {toggleAttribute} from '#core/dom';
import * as Preact from '#core/dom/jsx';

import {Services} from '#service';
Expand Down Expand Up @@ -122,9 +123,8 @@ class PaginationButton {
'i-amphtml-story-button-hidden',
!isEnabled
);
this.element
.querySelector('button')
?.toggleAttribute('disabled', !isEnabled);
const button = this.element.querySelector('button');
toggleAttribute(button, 'disabled', !isEnabled);
});
}

Expand Down
8 changes: 5 additions & 3 deletions src/amp-story-player/amp-story-player-impl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {Messaging} from '@ampproject/viewer-messaging';
import {devAssertElement} from '#core/assert';
import {VisibilityState_Enum} from '#core/constants/visibility-state';
import {Deferred} from '#core/data-structures/promise';
import {isJsonScriptTag, tryFocus} from '#core/dom';
import {isJsonScriptTag, toggleAttribute, tryFocus} from '#core/dom';
import {resetStyles, setStyle, setStyles} from '#core/dom/style';
import {findIndex, toArray} from '#core/types/array';
import {isEnumValue} from '#core/types/enum';
Expand Down Expand Up @@ -773,12 +773,14 @@ export class AmpStoryPlayer {
* @private
*/
checkButtonsDisabled_() {
this.prevButton_.toggleAttribute(
toggleAttribute(
this.prevButton_,
'disabled',
this.isIndexOutofBounds_(this.currentIdx_ - 1) &&
!this.isCircularWrappingEnabled_
);
this.nextButton_.toggleAttribute(
toggleAttribute(
this.nextButton_,
'disabled',
this.isIndexOutofBounds_(this.currentIdx_ + 1) &&
!this.isCircularWrappingEnabled_
Expand Down