Skip to content

chore(react-swatch-picker-preview): migrate from getNativeElementProps to getIntrinsicElementProps #29534

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
bsunderhus merged 1 commit into from
Oct 16, 2023
Merged

chore(react-swatch-picker-preview): migrate from getNativeElementProps to getIntrinsicElementProps #29534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...t-components/react-swatch-picker-preview/etc/react-swatch-picker-preview.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export type SwatchPickerSlots = {
export type SwatchPickerState = ComponentState<SwatchPickerSlots>;

// @public
export const useSwatchPicker_unstable: (props: SwatchPickerProps, ref: React_2.Ref<HTMLElement>) => SwatchPickerState;
export const useSwatchPicker_unstable: (props: SwatchPickerProps, ref: React_2.Ref<HTMLDivElement>) => SwatchPickerState;

// @public
export const useSwatchPickerStyles_unstable: (state: SwatchPickerState) => SwatchPickerState;
Expand Down
9 changes: 6 additions & 3 deletions ...act-components/react-swatch-picker-preview/src/components/SwatchPicker/useSwatchPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { getNativeElementProps, slot } from '@fluentui/react-utilities';
import { getIntrinsicElementProps, slot } from '@fluentui/react-utilities';
import type { SwatchPickerProps, SwatchPickerState } from './SwatchPicker.types';

/**
Expand All @@ -11,7 +11,10 @@ import type { SwatchPickerProps, SwatchPickerState } from './SwatchPicker.types'
* @param props - props from this instance of SwatchPicker
* @param ref - reference to root HTMLElement of SwatchPicker
*/
export const useSwatchPicker_unstable = (props: SwatchPickerProps, ref: React.Ref<HTMLElement>): SwatchPickerState => {
export const useSwatchPicker_unstable = (
props: SwatchPickerProps,
ref: React.Ref<HTMLDivElement>,
): SwatchPickerState => {
return {
// TODO add appropriate props/defaults
components: {
Expand All @@ -21,7 +24,7 @@ export const useSwatchPicker_unstable = (props: SwatchPickerProps, ref: React.Re
// TODO add appropriate slots, for example:
// mySlot: resolveShorthand(props.mySlot),
root: slot.always(
getNativeElementProps('div', {
getIntrinsicElementProps('div', {
ref,
...props,
}),
Expand Down