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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Block: Fix issues with rearranging stories in Firefox #12708

Merged
merged 8 commits into from
Nov 28, 2022
Merged

Block: Fix issues with rearranging stories in Firefox #12708

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d99671d
update css to fix dragging
timarney Nov 18, 2022
032308a
Merge branch 'main' into fix/12703-ff-drag-stories
timarney Nov 19, 2022
eb49267
Merge branch 'main' into fix/12703-ff-drag-stories
timarney Nov 21, 2022
6ec2b3d
Merge branch 'main' into fix/12703-ff-drag-stories
timarney Nov 22, 2022
3196f34
Merge branch 'main' into fix/12703-ff-drag-stories
timarney Nov 23, 2022
eeb1a7b
Merge branch 'main' into fix/12703-ff-drag-stories
swissspidy Nov 23, 2022
7d13743
Don鈥檛 render button if story card is not selectable
swissspidy Nov 23, 2022
bc438c8
Merge branch 'main' into fix/12703-ff-drag-stories
timarney Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/stories-block/src/block/components/storyPicker/itemOverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function ItemOverlay({
story,
addSelectedStory,
removeSelectedStory,
isSelectable,
}) {
const onClickOverlay = useCallback(
(event) => {
Expand Down Expand Up @@ -58,6 +59,10 @@ function ItemOverlay({
[removeSelectedStory, addSelectedStory, story, isSelected]
);

if (!isSelectable) {
return <div className="web-stories-story-preview-card__overlay" />;
}

return (
<button
type="button"
Expand Down Expand Up @@ -88,6 +93,7 @@ ItemOverlay.propTypes = {
story: PropTypes.object.isRequired,
addSelectedStory: PropTypes.func,
removeSelectedStory: PropTypes.func,
isSelectable: PropTypes.bool,
};

export default ItemOverlay;
2 changes: 1 addition & 1 deletion packages/stories-block/src/block/components/storyPicker/sortStories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function SortStories({ selectedStories, setSelectedStories }) {
data-order={index}
draggable
>
<StoryPreview story={story} />
<StoryPreview story={story} isSelectable={false} />
</div>
);
}}
Expand Down
3 changes: 3 additions & 0 deletions packages/stories-block/src/block/components/storyPicker/storyPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function StoryPreview({
isSelected,
addSelectedStory = noop,
removeSelectedStory = noop,
isSelectable = true,
}) {
// @todo Keep an eye on this experimental API, make necessary changes when this gets updated in core.
const dateFormat = __experimentalGetSettings().formats.date;
Expand Down Expand Up @@ -83,6 +84,7 @@ function StoryPreview({
story={story}
addSelectedStory={addSelectedStory}
removeSelectedStory={removeSelectedStory}
isSelectable={isSelectable}
/>
{posterImage && (
<img src={posterImage} alt="" width={640} height={853} />
Expand All @@ -108,6 +110,7 @@ StoryPreview.propTypes = {
isSelected: PropTypes.bool,
addSelectedStory: PropTypes.func,
removeSelectedStory: PropTypes.func,
isSelectable: PropTypes.bool,
};

export default StoryPreview;