Skip to content
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

Jump to bottom

Code: Removed enabled feature flag for extraPages #12350

Merged
merged 5 commits into from
Oct 3, 2022
Merged

Code: Removed enabled feature flag for extraPages #12350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e89962
Code: Removed enabled feature flag for `extraPages`
Sep 21, 2022
32c15fa
Merge branch 'main' into code/12304-exit-extra-pages-flag
merapi Sep 30, 2022
fb6c596
Merge branch 'main' into code/12304-exit-extra-pages-flag
swissspidy Sep 30, 2022
a478af0
Merge branch 'main' into code/12304-exit-extra-pages-flag
Oct 3, 2022
f12f2e4
Better query for frames
Oct 3, 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
12 changes: 0 additions & 12 deletions includes/Experiments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,6 @@ public function get_experiments(): array {
'description' => __( 'Allow locked stories to be taken over by another author', 'web-stories' ),
'group' => 'editor',
],
/**
* Author: @barklund
* Issue: #9643
* Creation date: 2022-06-21
*/
[
'name' => 'extraPages',
'label' => __( 'Context Pages', 'web-stories' ),
'description' => __( 'Show extra pages for context before and after the current canvas page. Note: This might come with a performance penalty.', 'web-stories' ),
'group' => 'editor',
'default' => true,
],
/**
* Author: @timarney
* Issue: #12093
Expand Down
4 changes: 1 addition & 3 deletions packages/story-editor/src/components/canvas/extraPages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import { memo } from '@googleforcreators/react';
import { PAGE_RATIO } from '@googleforcreators/units';
import PropTypes from 'prop-types';
import { __, sprintf } from '@googleforcreators/i18n';
import { useFeature } from 'flagged';
import { useTransform } from '@googleforcreators/transform';

/**
Expand Down Expand Up @@ -114,9 +113,8 @@ function ExtraPages({ isPrevious = false }) {
({ state: { isAnythingTransforming } }) => isAnythingTransforming
);

const isExtraPagesEnabled = useFeature('extraPages');
const pageCount = pages?.length;
if (!pageCount || !isExtraPagesEnabled) {
if (!pageCount) {
return null;
}
const pagesToShow = getPagesToShow({
Expand Down
4 changes: 3 additions & 1 deletion packages/story-editor/src/karma/fixture/containers/canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ class FramesLayer extends AbstractLayer {
get frames() {
return this._getAll(
// @todo: improve query.
this.node.querySelectorAll('[data-element-id]'),
this.node.querySelectorAll(
'[data-testid="frameElement"][data-element-id]'
),
(node) => `frames[${node.getAttribute('data-element-id')}]`,
Frame
);
Expand Down