Skip to content

[RNMobile] Refactor: gallery to nested image blocks #26823

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

Closed
dratwas wants to merge 152 commits into from
Closed

[RNMobile] Refactor: gallery to nested image blocks #26823

Changes from 1 commit
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
729907f
Refactor gallery to use nested image blocks
Nov 3, 2020
53cf527
Fix issue with images not loading on first selection from media gallery
Nov 4, 2020
4d95e95
Remove the default columns setting as we don't have access to innerBl…
Nov 4, 2020
0437b8b
Revert "Remove the default columns setting as we don't have access to…
Nov 4, 2020
18dd0a2
Add image count so we can work out default columns as innerBlocks not…
Nov 4, 2020
fdc4d89
Update Gallery to nested image blocks
Nov 4, 2020
f10fc98
Fix issue with images not loading on first selection from media gallery
Nov 4, 2020
e9bfd5f
Remove the default columns setting as we don't have access to innerBl…
Nov 4, 2020
1534386
Revert "Remove the default columns setting as we don't have access to…
Nov 4, 2020
38ab027
Add image count so we can work out default columns as innerBlocks not…
Nov 4, 2020
cc05d60
Disable the innerBlocks dropzones so drag drop works same as existing…
Nov 5, 2020
9b0abcc
Lint changes
Nov 5, 2020
57abff0
WIP
dratwas Nov 5, 2020
74d0fb7
Revert "Lint changes"
Nov 6, 2020
2b17d24
Revert "Disable the innerBlocks dropzones so drag drop works same as …
Nov 6, 2020
98454b1
Suggested solution for handling multiple file drop into gallery
Nov 6, 2020
7d4c2d3
Remove non image files from drag and drop and disable individual imag…
Nov 8, 2020
91faab5
Fix transform to individual images
Nov 8, 2020
e0d11b1
Fix transform from individual images
Nov 8, 2020
795fd47
fix dirty-image-options
dratwas Nov 9, 2020
2ec63f1
fix spacing
dratwas Nov 9, 2020
2d9a56e
Revert drag and drop transform changes
Nov 9, 2020
a868f58
Add gallery transform to image block to override the default gallery …
Nov 9, 2020
c0f043d
Add imageCrop, blockProps to block-list and style fixes
dratwas Nov 10, 2020
c2fbfa8
Temporary remove the gallery from initial-html
dratwas Nov 10, 2020
4f7b505
Merge branch 'refactor/gallery-to-nested-image-blocks' into rnmobile/…
dratwas Nov 10, 2020
051a2b8
Add gallery caption
dratwas Nov 10, 2020
39e758f
lint fix
dratwas Nov 10, 2020
b1d9072
Use grid Component instead of numColumns
dratwas Nov 13, 2020
fb6fea4
Merge branch 'refactor/gallery-to-nested-image-blocks' into rnmobile/…
dratwas Nov 13, 2020
50a7719
fix for Android
dratwas Nov 13, 2020
042a17b
Fix Android
dratwas Nov 13, 2020
252916d
Use grid in list item and fix adding of new images
dratwas Nov 16, 2020
ca8f3db
Move handling of file uploads to Gallery from media placeholder
Nov 16, 2020
324dddb
split innerblocks mapping into separate effect to reduce chatter
Nov 17, 2020
5c4018e
Merge branch 'refactor/gallery-to-nested-image-blocks' into rnmobile/…
dratwas Nov 17, 2020
67bfc4f
Use Picker for dirt image options and add some fixes
dratwas Nov 17, 2020
291bfb4
Add useMemo to currentImageOptions
Nov 17, 2020
0d96752
reuse existing innerBlocks rather than recreating with every new imag…
Nov 17, 2020
7eaa8bc
Switch to useMemo for updating local image const instead of local com…
Nov 17, 2020
f0a1e36
Fix issue with image sizing not being available on initial load of co…
Nov 17, 2020
d85f841
Memoise the useImageSizes hook
Nov 17, 2020
32ac8dd
Fix issue with media browser defaulting to edit gallery view
Nov 17, 2020
a32987a
Fix missed incorrect use of addToGallery
Nov 17, 2020
e7b694d
fix initial Picker
dratwas Nov 18, 2020
f90d1b5
Change the header text of picker
dratwas Nov 18, 2020
77ca738
Merge branch 'refactor/gallery-to-nested-image-blocks' into rnmobile/…
dratwas Nov 18, 2020
e1fe0eb
fix android dirty images options
dratwas Nov 18, 2020
2d400ea
Add some extra effects for getting the imageData as the getMedia call…
Nov 18, 2020
76fe72e
Simplify the imageData by using a useSelect
Nov 19, 2020
1243c63
Another optimisation - only return a new imageData reference if all i…
Nov 19, 2020
8aeec07
Refactored Gallery: Add loading state to gallery image size options (…
aaronrobertshaw Nov 19, 2020
9658eef
Initial deprecations commit
Nov 19, 2020
b9eebc5
Fix issue with linkDestination not being applied in migration
Nov 19, 2020
493196a
Refactor gallery deprecations
aaronrobertshaw Nov 20, 2020
b48028b
Fix missing attributes from migration
aaronrobertshaw Nov 20, 2020
023d391
Update deprecation to set allowResize
aaronrobertshaw Nov 22, 2020
6c059e1
Fix issue with crop not working when certain plugins are loaded
Nov 22, 2020
e412366
Fix SCSS lint errors
aaronrobertshaw Nov 22, 2020
b0d477c
Update the block example
Nov 23, 2020
aae1a7e
Linting fixes
Nov 23, 2020
29a8e08
Fix the e2e test and the accessibility issue with having aria group r…
Nov 23, 2020
933a60f
fix linting issues
Nov 23, 2020
33ddaff
Fix frontend omission of wp-block-image class
aaronrobertshaw Nov 24, 2020
f1f2fe7
apply CR suggestions
dratwas Nov 24, 2020
7a9cad4
Merge branch 'refactor/gallery-to-nested-image-blocks' into rnmobile/…
dratwas Nov 24, 2020
cf101ce
change deprecation to use imageCount as isEligible check as it seems …
Nov 25, 2020
7e306bf
Merge branch 'refactor/gallery-to-nested-image-blocks' into rnmobile/…
dratwas Nov 25, 2020
e51389c
fix overflow
dratwas Nov 26, 2020
789019c
fix dirty-image-options
dratwas Nov 26, 2020
e63870c
Update Gallery to nested image blocks
Jan 13, 2021
5a0ab09
Fix issue with images not loading on first selection from media gallery
Nov 4, 2020
3a0f2aa
Remove the default columns setting as we don't have access to innerBl…
Nov 4, 2020
77ac0f2
Revert "Remove the default columns setting as we don't have access to…
Nov 4, 2020
a365dc7
Add image count so we can work out default columns as innerBlocks not…
Nov 4, 2020
085b5fc
Disable the innerBlocks dropzones so drag drop works same as existing…
Nov 5, 2020
c2d5c85
Lint changes
Nov 5, 2020
970bf6f
Revert "Lint changes"
Nov 6, 2020
9e44909
Revert "Disable the innerBlocks dropzones so drag drop works same as …
Nov 6, 2020
a9ca983
Suggested solution for handling multiple file drop into gallery
Nov 6, 2020
e33e0c2
Remove non image files from drag and drop and disable individual imag…
Nov 8, 2020
c4cb26b
Fix transform to individual images
Nov 8, 2020
f3726b6
Fix transform from individual images
Nov 8, 2020
8a296f7
Revert drag and drop transform changes
Nov 9, 2020
3882fb6
Add gallery transform to image block to override the default gallery …
Nov 9, 2020
3fe9007
Move handling of file uploads to Gallery from media placeholder
Nov 16, 2020
6660d86
split innerblocks mapping into separate effect to reduce chatter
Nov 17, 2020
54c0ca7
Add useMemo to currentImageOptions
Nov 17, 2020
c63dd6d
reuse existing innerBlocks rather than recreating with every new imag…
Nov 17, 2020
f636509
Switch to useMemo for updating local image const instead of local com…
Nov 17, 2020
d85294d
Fix issue with image sizing not being available on initial load of co…
Nov 17, 2020
99cc601
Memoise the useImageSizes hook
Nov 17, 2020
f873ef6
Fix issue with media browser defaulting to edit gallery view
Nov 17, 2020
ebd462b
Fix missed incorrect use of addToGallery
Nov 17, 2020
05c910b
Add some extra effects for getting the imageData as the getMedia call…
Nov 18, 2020
00ba2c9
Simplify the imageData by using a useSelect
Nov 19, 2020
8b7130e
Another optimisation - only return a new imageData reference if all i…
Nov 19, 2020
dcecc15
Refactored Gallery: Add loading state to gallery image size options (…
aaronrobertshaw Nov 19, 2020
066d002
Initial deprecations commit
Jan 13, 2021
65455f8
Fix issue with linkDestination not being applied in migration
Nov 19, 2020
1f46bb7
Refactor gallery deprecations
aaronrobertshaw Nov 20, 2020
fe2afc7
Fix missing attributes from migration
aaronrobertshaw Nov 20, 2020
c60f472
Update deprecation to set allowResize
aaronrobertshaw Nov 22, 2020
70cc084
Fix issue with crop not working when certain plugins are loaded
Nov 22, 2020
87829c2
Fix SCSS lint errors
aaronrobertshaw Nov 22, 2020
32e2527
Update the block example
Nov 23, 2020
5bbf634
Linting fixes
Nov 23, 2020
47213ac
Fix the e2e test and the accessibility issue with having aria group r…
Nov 23, 2020
da7963e
fix linting issues
Nov 23, 2020
d92d2a0
Fix frontend omission of wp-block-image class
aaronrobertshaw Nov 24, 2020
83b5821
change deprecation to use imageCount as isEligible check as it seems …
Nov 25, 2020
e669798
Move back to a single deprecations file and reorder in array
Nov 26, 2020
4e97415
Remove additional check in v5 isEligible
Nov 26, 2020
4d02b9d
Fix the v4 migration
Nov 26, 2020
bfc97df
Fix styles for Safari compatibility
aaronrobertshaw Nov 30, 2020
6d89c0e
Remove unnecessary gallery editor styles
aaronrobertshaw Nov 30, 2020
4c48cc2
Fix typo in deprecations
aaronrobertshaw Nov 30, 2020
41b561f
Restore styles to render deprecated gallery versions
aaronrobertshaw Dec 1, 2020
ae1d2d6
Avoid applying flex styles to IE11
aaronrobertshaw Dec 1, 2020
b64b28b
Add additional selector to prevent the hidden individual image drop z…
Dec 1, 2020
f791150
IE11 styling improvements
aaronrobertshaw Dec 2, 2020
f3f5f20
Apply default style class to new images added to gallery
Dec 11, 2020
d39db2b
fix linting issues
Dec 11, 2020
39ae626
Move block props to the outer wrapper
Dec 13, 2020
f0771fa
Revert "Move block props to the outer wrapper"
Dec 13, 2020
0248332
Revert "Revert "Move block props to the outer wrapper""
Dec 13, 2020
dfb5c33
Fetch media if isListItem is true
Jan 13, 2021
f94e3ae
Change context from isListItem to isGrouped
Jan 13, 2021
cc9a294
Remove external div wrapper by moving InnerBlocks to a fragment
Jan 13, 2021
746a480
remove extra wrapper around media placeholder and caption and use fle…
Jan 13, 2021
1014505
Revert "remove extra wrapper around media placeholder and caption and…
Jan 13, 2021
35b34ab
Revert "Remove external div wrapper by moving InnerBlocks to a fragment"
Jan 13, 2021
afa436c
another update to image wrapper
Jan 13, 2021
545dd75
put media uploader outside figure so structure matches front end
Dec 17, 2020
2f4f9a1
Replace div with View for the sake of native code
Dec 17, 2020
150d907
Move setting of attributes to the child images
Jan 13, 2021
31028d5
Gallery Block Refactor: Account for null image ids in gallery migrati…
glendaviesnz Dec 22, 2020
70e97b6
Remove the gradient and put caption under image if is-rounded style a…
glendaviesnz Dec 24, 2020
b6c5ce5
Remove outer div wrapper
Jan 13, 2021
aa33399
Keep image margins while dragging sibling
aaronrobertshaw Jan 14, 2021
f5e1485
Fix e2e test expected markup to match new structure
Jan 18, 2021
047d8a7
merge with base branch
dratwas Jan 18, 2021
3fbcda3
resolve conflicts
dratwas Jan 18, 2021
835c7be
remove unused deprecation files
dratwas Jan 18, 2021
a789cb4
revert changes in picker
dratwas Jan 18, 2021
88fc544
fix web scss changes after rebase
dratwas Jan 18, 2021
187d5ac
remove not needed change
dratwas Jan 18, 2021
a31a9ec
remove dirty image options
dratwas Jan 18, 2021
8a546ff
rever changes in gallery edit
dratwas Jan 18, 2021
cd3c3f4
WIP use context to set target destination and slug
dratwas Jan 19, 2021
ad6d313
Fix inherted image props in gallery
dratwas Jan 21, 2021
e231bbe
fix key in bloc-styles
dratwas Jan 21, 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 additional check in v5 isEligible
  • Loading branch information
Glen Davies committed Jan 14, 2021
commit 4e9741563ba35b1d999adc786d875f8126d62883
9 changes: 2 additions & 7 deletions packages/block-library/src/gallery/deprecated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,13 +666,8 @@ const v5 = {
supports: {
align: true,
},
isEligible( { linkTo, imageCount } ) {
return (
! linkTo ||
linkTo === 'attachment' ||
linkTo === 'media' ||
! imageCount
);
isEligible( { linkTo } ) {
return ! linkTo || linkTo === 'attachment' || linkTo === 'media';
},
migrate( attributes ) {
let linkTo = attributes.linkTo;
Expand Down