Skip to content

🚮 Clean up dead amp-sidebar code within stories #36178

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
gmajoulet merged 14 commits into from
Sep 30, 2021
Merged

🚮 Clean up dead amp-sidebar code within stories #36178

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
366e4a1
Remove amp-sidebar code from extensions/amp-story
coreymasanto Sep 27, 2021
627fc3e
Remove amp-sidebar visual tests from examples/visual-tests/amp-story
coreymasanto Sep 27, 2021
313e517
Remove reference to amp-sidebar from amp-story-interactive README
coreymasanto Sep 27, 2021
ca235c1
Remove remaining amp-sidebar logic from extensions/amp-story
coreymasanto Sep 27, 2021
0696fc5
Remove amp-sidebar logic from amp-story-system-layer code
coreymasanto Sep 27, 2021
973910d
Remove amp-sidebar code from amp-story-store-service.js
coreymasanto Sep 27, 2021
3b00f1a
Remove amp-sidebar storybook JS files
coreymasanto Sep 27, 2021
ef2a7a8
Merge branch 'main' into amp-sidebar-cleanup
coreymasanto Sep 27, 2021
fc909a0
A few missed deletions in test-amp-story and build-system/ caught by …
coreymasanto Sep 27, 2021
cad9568
Revert extensions/amp-sidebar/*/storybook removal from forbidden terms
coreymasanto Sep 29, 2021
197c365
Add back the amp-sidebar storybook files
coreymasanto Sep 30, 2021
6c17c6d
Merge branch 'main' into amp-sidebar-cleanup
coreymasanto Sep 30, 2021
307c201
Add newline at end of each storybook file
coreymasanto Sep 30, 2021
b7d4a6f
Run amp get-zindex --fix
coreymasanto Sep 30, 2021
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
Prev Previous commit
Next Next commit
Remove amp-sidebar code from amp-story-store-service.js
  • Loading branch information
@coreymasanto
coreymasanto committed Sep 27, 2021
commit 973910d1b52cbecb579c5b15d941926e852717c2
23 changes: 0 additions & 23 deletions extensions/amp-story/1.0/amp-story-store-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export let InteractiveReactData;
* desktopState: boolean,
* educationState: boolean,
* gyroscopeEnabledState: string,
* hasSidebarState: boolean,
* infoDialogState: boolean,
* interactiveEmbeddedComponentState: !InteractiveComponentDef,
* interactiveReactState: !Map<string, !InteractiveReactData>,
Expand All @@ -100,7 +99,6 @@ export let InteractiveReactData;
* previewState: boolean,
* rtlState: boolean,
* shareMenuState: boolean,
* sidebarState: boolean,
* storyHasAudioState: boolean,
* storyHasPlaybackUiState: boolean,
* storyHasBackgroundAudioState: boolean,
Expand Down Expand Up @@ -139,7 +137,6 @@ export const StateProperty = {
AFFILIATE_LINK_STATE: 'affiliateLinkState',
EDUCATION_STATE: 'educationState',
GYROSCOPE_PERMISSION_STATE: 'gyroscopePermissionState',
HAS_SIDEBAR_STATE: 'hasSidebarState',
INFO_DIALOG_STATE: 'infoDialogState',
INTERACTIVE_COMPONENT_STATE: 'interactiveEmbeddedComponentState',
// State of interactive components (polls, quizzes) on the story.
Expand All @@ -154,7 +151,6 @@ export const StateProperty = {
PREVIEW_STATE: 'previewState',
RTL_STATE: 'rtlState',
SHARE_MENU_STATE: 'shareMenuState',
SIDEBAR_STATE: 'sidebarState',
SUPPORTED_BROWSER_STATE: 'supportedBrowserState',
// Any page has audio, or amp-story has a `background-audio` attribute.
STORY_HAS_AUDIO_STATE: 'storyHasAudioState',
Expand Down Expand Up @@ -190,7 +186,6 @@ export const Action = {
TOGGLE_AD: 'toggleAd',
TOGGLE_AFFILIATE_LINK: 'toggleAffiliateLink',
TOGGLE_EDUCATION: 'toggleEducation',
TOGGLE_HAS_SIDEBAR: 'toggleHasSidebar',
TOGGLE_INFO_DIALOG: 'toggleInfoDialog',
TOGGLE_INTERACTIVE_COMPONENT: 'toggleInteractiveComponent',
TOGGLE_KEYBOARD_ACTIVE_STATE: 'toggleKeyboardActiveState',
Expand All @@ -201,7 +196,6 @@ export const Action = {
TOGGLE_PAUSED: 'togglePaused',
TOGGLE_RTL: 'toggleRtl',
TOGGLE_SHARE_MENU: 'toggleShareMenu',
TOGGLE_SIDEBAR: 'toggleSidebar',
TOGGLE_SUPPORTED_BROWSER: 'toggleSupportedBrowser',
TOGGLE_STORY_HAS_AUDIO: 'toggleStoryHasAudio',
TOGGLE_STORY_HAS_BACKGROUND_AUDIO: 'toggleStoryHasBackgroundAudio',
Expand Down Expand Up @@ -381,21 +375,6 @@ const actions = (state, action, data) => {
...state,
[StateProperty.KEYBOARD_ACTIVE_STATE]: !!data,
});
case Action.TOGGLE_SIDEBAR:
// Don't change the PAUSED_STATE if SIDEBAR_STATE is not changed.
if (state[StateProperty.SIDEBAR_STATE] === data) {
return state;
}
return /** @type {!State} */ ({
...state,
[StateProperty.PAUSED_STATE]: !!data,
[StateProperty.SIDEBAR_STATE]: !!data,
});
case Action.TOGGLE_HAS_SIDEBAR:
return /** @type {!State} */ ({
...state,
[StateProperty.HAS_SIDEBAR_STATE]: !!data,
});
case Action.TOGGLE_SUPPORTED_BROWSER:
return /** @type {!State} */ ({
...state,
Expand Down Expand Up @@ -573,7 +552,6 @@ export class AmpStoryStoreService {
[StateProperty.AFFILIATE_LINK_STATE]: null,
[StateProperty.EDUCATION_STATE]: false,
[StateProperty.GYROSCOPE_PERMISSION_STATE]: '',
[StateProperty.HAS_SIDEBAR_STATE]: false,
[StateProperty.INFO_DIALOG_STATE]: false,
[StateProperty.INTERACTIVE_COMPONENT_STATE]: {
state: EmbeddedComponentState.HIDDEN,
Expand All @@ -588,7 +566,6 @@ export class AmpStoryStoreService {
[StateProperty.PAUSED_STATE]: false,
[StateProperty.RTL_STATE]: false,
[StateProperty.SHARE_MENU_STATE]: false,
[StateProperty.SIDEBAR_STATE]: false,
[StateProperty.SUPPORTED_BROWSER_STATE]: true,
[StateProperty.STORY_HAS_AUDIO_STATE]: false,
[StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE]: false,
Expand Down