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

Interactivity API: Remove unused state and rename props to attributes in getElement() #57974

Merged
merged 6 commits into from
Jan 18, 2024
Merged

Interactivity API: Remove unused state and rename props to attributes in getElement() #57974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1864695
Remove state from getElement()
cbravobernal Jan 18, 2024
ae0845a
Refactor props to attributes in getElement()
cbravobernal Jan 18, 2024
2456620
Update changelog
cbravobernal Jan 18, 2024
ce2b3ba
Update spaces in CHANGELOG
luisherranz Jan 18, 2024
2963e90
Fix spaces in changelog
luisherranz Jan 18, 2024
ecd1b9b
Fix duplicate section
luisherranz Jan 18, 2024
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
8 changes: 3 additions & 5 deletions packages/interactivity/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@

### Enhancements

- Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
- Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
- Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))

### New Features

- Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))

### Enhancements

- Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))

### Breaking Changes

- Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
- Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
- Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([#57974](https://github.com/WordPress/gutenberg/pull/57974))

### Bug Fix

Expand Down
15 changes: 6 additions & 9 deletions packages/interactivity/src/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
import { h, options, createContext, cloneElement } from 'preact';
import { useRef, useCallback, useContext } from 'preact/hooks';
import { deepSignal } from 'deepsignal';
import type { VNode, Context, RefObject } from 'preact';

/**
Expand Down Expand Up @@ -60,8 +59,7 @@ interface Scope {
evaluate: Evaluate;
context: Context< any >;
ref: RefObject< HTMLElement >;
state: any;
props: any;
attributes: h.JSX.HTMLAttributes;
}

interface Evaluate {
Expand Down Expand Up @@ -142,11 +140,10 @@ export const getElement = () => {
'Cannot call `getElement()` outside getters and actions used by directives.'
);
}
const { ref, state, props } = getScope();
const { ref, attributes } = getScope();
return Object.freeze( {
ref: ref.current,
state,
props: deepImmutable( props ),
attributes: deepImmutable( attributes ),
} );
};

Expand Down Expand Up @@ -313,12 +310,12 @@ const Directives = ( {
scope.context = useContext( context );
/* eslint-disable react-hooks/rules-of-hooks */
scope.ref = previousScope?.ref || useRef( null );
scope.state = previousScope?.state || useRef( deepSignal( {} ) ).current;
/* eslint-enable react-hooks/rules-of-hooks */

// Create a fresh copy of the vnode element and add the props to the scope.
// Create a fresh copy of the vnode element and add the props to the scope,
// named as attributes (HTML Attributes).
element = cloneElement( element, { ref: scope.ref } );
scope.props = element.props;
scope.attributes = element.props;

// Recursively render the wrapper for the next priority level.
const children =
Expand Down
Loading