Skip to content

More fixes and backports for WP 5.8 beta 4 #32992

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
youknowriad merged 12 commits into from
Jun 25, 2021
Merged

More fixes and backports for WP 5.8 beta 4 #32992

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
256e5cd
Fix drag and drop indices when block list contains a style element (#…
talldan Jun 25, 2021
a8c4909
Fix wide widget styles to allow floated contents. (#32976)
tellthemachines Jun 25, 2021
90a317b
Widget Editor: Fix allow adding same image twice (#32951)
thisissandip Jun 25, 2021
c65792b
Improve insertion point and drag-n-drop in the widgets screen (#32953)
kevin940726 Jun 25, 2021
74a8873
Adjust legacy widget form styles to match editor. (#32974)
tellthemachines Jun 25, 2021
9e23649
Allow making context specific requests using the data module (#32961)
youknowriad Jun 25, 2021
404457e
[Block Library - Post Terms]: Fix handling for low privileged users (…
ntsekouras Jun 25, 2021
e699578
[Block Library - Categories]: Fix crash when trying to access categor…
ntsekouras Jun 25, 2021
d9e3ff6
[Block Library - Site Logo]: Add permissions handling (#32919)
ntsekouras Jun 25, 2021
f5679e2
Fix: template editor header area is difficult to navigate with screen…
jorgefilipecosta Jun 25, 2021
8660890
Only reset edits for requests on the default context (#32991)
ntsekouras Jun 25, 2021
d66a1a8
[Block Library - Categories]: Fix handling for low privileged users
ntsekouras Jun 25, 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
Widget Editor: Fix allow adding same image twice (#32951) 
* Widget Editor: Fix allow adding same image twice

* remove duplicate reference widget instances only for legacy widgets

* update id check

Co-authored-by: Kai Hao <[email protected]>

Co-authored-by: Kai Hao <[email protected]>
  • Loading branch information
@thisissandip @kevin940726 @youknowriad
2 people authored and youknowriad committed Jun 25, 2021
commit 90a317bfd8e13b03824af6a60639c05b0b4c7e03
11 changes: 8 additions & 3 deletions packages/edit-widgets/src/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,15 @@ export function* saveWidgetArea( widgetAreaId ) {
( { sidebar } ) => sidebar === widgetAreaId
);

// Remove all duplicate reference widget instances
// Remove all duplicate reference widget instances for legacy widgets.
// Why? We filter out the widgets with duplicate IDs to prevent adding more than one instance of a widget
// implemented using a function. WordPress doesn't support having more than one instance of these, if you try to
// save multiple instances of these in different sidebars you will run into undefined behaviors.
const usedReferenceWidgets = [];
const widgetsBlocks = post.blocks.filter( ( { attributes: { id } } ) => {
if ( id ) {
const widgetsBlocks = post.blocks.filter( ( block ) => {
const { id } = block.attributes;

if ( block.name === 'core/legacy-widget' && id ) {
if ( usedReferenceWidgets.includes( id ) ) {
return false;
}
Expand Down