SlotFill: replace valtio with custom ObservableMap #60879
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { useMemo, useSyncExternalStore } from '@wordpress/element'; | ||
|
|
||
| export type ObservableMap< K, V > = { | ||
| get( name: K ): V | undefined; | ||
| set( name: K, value: V ): void; | ||
| delete( name: K ): void; | ||
| subscribe( name: K, listener: () => void ): () => void; | ||
| }; | ||
|
|
||
| export function observableMap< K, V >(): ObservableMap< K, V > { | ||
| const map = new Map< K, V >(); | ||
| const listeners = new Map< K, Set< () => void > >(); | ||
|
|
||
| function callListeners( name: K ) { | ||
| const list = listeners.get( name ); | ||
| if ( ! list ) { | ||
| return; | ||
| } | ||
| for ( const listener of list ) { | ||
| listener(); | ||
| } | ||
| } | ||
|
|
||
| function unsubscribe( name: K, listener: () => void ) { | ||
| return () => { | ||
| const list = listeners.get( name ); | ||
| if ( ! list ) { | ||
| return; | ||
| } | ||
|
|
||
| list.delete( listener ); | ||
| if ( list.size === 0 ) { | ||
| listeners.delete( name ); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| return { | ||
| get( name ) { | ||
| return map.get( name ); | ||
| }, | ||
| set( name, value ) { | ||
| map.set( name, value ); | ||
| callListeners( name ); | ||
| }, | ||
| delete( name ) { | ||
| map.delete( name ); | ||
| callListeners( name ); | ||
| }, | ||
| subscribe( name, listener ) { | ||
| let list = listeners.get( name ); | ||
| if ( ! list ) { | ||
| list = new Set(); | ||
| listeners.set( name, list ); | ||
| } | ||
| list.add( listener ); | ||
|
|
||
| return unsubscribe( name, listener ); | ||
|
There was a problem hiding this comment. Wouldn't it be possible to avoid having to get the list again if it's inlined? Or can it disappear/change some other way? There was a problem hiding this comment. Good idea, will do in a followup 👍 |
||
| }, | ||
| }; | ||
| } | ||
|
|
||
| export function useObservableValue< K, V >( | ||
|
There was a problem hiding this comment. I'm not particularly convinced this belongs here, but if we don't need it outside of the component for now, that should be fine. |
||
| map: ObservableMap< K, V >, | ||
| name: K | ||
| ): V | undefined { | ||
| const [ subscribe, getValue ] = useMemo( | ||
| () => [ | ||
| ( listener: () => void ) => map.subscribe( name, listener ), | ||
| () => map.get( name ), | ||
| ], | ||
| [ map, name ] | ||
| ); | ||
| return useSyncExternalStore( subscribe, getValue ); | ||
| } | ||
|
There was a problem hiding this comment. I wonder if we could use this for block refs too: https://github.com/WordPress/gutenberg/blob/trunk/packages/block-editor/src/components/block-list/use-block-props/use-block-refs.js And maybe there are more places? There was a problem hiding this comment. Let me figure out what |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it would be nice to add some inline docs and/or some tests.