Compat for react-text

microsoft · Jun 28, 2021 · c2088cb · c2088cb
1 parent 391f141
commit c2088cb
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/packages/react-checkbox/etc/react-checkbox.api.md b/packages/react-checkbox/etc/react-checkbox.api.md
@@ -4,8 +4,8 @@
 
 ```ts
 
-import { ComponentProps } from '@fluentui/react-utilities';
-import { ComponentState } from '@fluentui/react-utilities';
+import { ComponentPropsCompat } from '@fluentui/react-utilities';
+import { ComponentStateCompat } from '@fluentui/react-utilities';
 import * as React_2 from 'react';
 
 // @public
@@ -15,7 +15,7 @@ export const Checkbox: React_2.ForwardRefExoticComponent<CheckboxProps & React_2
 export type CheckboxDefaultedProps = never;
 
 // @public
-export interface CheckboxProps extends ComponentProps, React_2.HTMLAttributes<HTMLElement> {
+export interface CheckboxProps extends ComponentPropsCompat, React_2.HTMLAttributes<HTMLElement> {
 }
 
 // @public
@@ -25,7 +25,7 @@ export type CheckboxShorthandProps = never;
 export const checkboxShorthandProps: CheckboxShorthandProps[];
 
 // @public
-export interface CheckboxState extends ComponentState<CheckboxProps, CheckboxShorthandProps, CheckboxDefaultedProps> {
+export interface CheckboxState extends ComponentStateCompat<CheckboxProps, CheckboxShorthandProps, CheckboxDefaultedProps> {
     ref: React_2.Ref<HTMLElement>;
 }
 

diff --git a/packages/react-checkbox/src/components/Checkbox/Checkbox.types.ts b/packages/react-checkbox/src/components/Checkbox/Checkbox.types.ts
@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { ComponentProps, ComponentState } from '@fluentui/react-utilities';
+import { ComponentPropsCompat, ComponentStateCompat } from '@fluentui/react-utilities';
 
 /**
  * Checkbox Props
  */
-export interface CheckboxProps extends ComponentProps, React.HTMLAttributes<HTMLElement> {
+export interface CheckboxProps extends ComponentPropsCompat, React.HTMLAttributes<HTMLElement> {
   /*
    * TODO Add props and slots here
    * Any slot property should be listed in the checkboxShorthandProps array below
@@ -25,7 +25,8 @@ export type CheckboxDefaultedProps = never; // TODO add names of properties with
 /**
  * State used in rendering Checkbox
  */
-export interface CheckboxState extends ComponentState<CheckboxProps, CheckboxShorthandProps, CheckboxDefaultedProps> {
+export interface CheckboxState
+  extends ComponentStateCompat<CheckboxProps, CheckboxShorthandProps, CheckboxDefaultedProps> {
   /**
    * Ref to the root element
    */

diff --git a/packages/react-checkbox/src/components/Checkbox/renderCheckbox.tsx b/packages/react-checkbox/src/components/Checkbox/renderCheckbox.tsx
@@ -1,13 +1,13 @@
 import * as React from 'react';
-import { getSlots } from '@fluentui/react-utilities';
+import { getSlotsCompat } from '@fluentui/react-utilities';
 import { CheckboxState } from './Checkbox.types';
 import { checkboxShorthandProps } from './useCheckbox';
 
 /**
  * Render the final JSX of Checkbox
  */
 export const renderCheckbox = (state: CheckboxState) => {
-  const { slots, slotProps } = getSlots(state, checkboxShorthandProps);
+  const { slots, slotProps } = getSlotsCompat(state, checkboxShorthandProps);
 
   return (
     <slots.root {...slotProps.root}>

diff --git a/packages/react-text/etc/react-text.api.md b/packages/react-text/etc/react-text.api.md
@@ -4,8 +4,8 @@
 
 ```ts
 
-import { ComponentProps } from '@fluentui/react-utilities';
-import { ComponentState } from '@fluentui/react-utilities';
+import { ComponentPropsCompat } from '@fluentui/react-utilities';
+import { ComponentStateCompat } from '@fluentui/react-utilities';
 import * as React_2 from 'react';
 
 // @public
@@ -20,11 +20,11 @@ export { Text_2 as Text }
 export type TextDefaultedProps = never;
 
 // @public
-export interface TextProps extends ComponentProps, React_2.HTMLAttributes<HTMLElement> {
+export interface TextProps extends ComponentPropsCompat, React_2.HTMLAttributes<HTMLElement> {
 }
 
 // @public
-export interface TextState extends ComponentState<TextProps, TextDefaultedProps> {
+export interface TextState extends ComponentStateCompat<TextProps, TextDefaultedProps> {
     ref: React_2.Ref<HTMLElement>;
 }
 

diff --git a/packages/react-text/src/components/Text/Text.types.ts b/packages/react-text/src/components/Text/Text.types.ts
@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { ComponentProps, ComponentState } from '@fluentui/react-utilities';
+import { ComponentPropsCompat, ComponentStateCompat } from '@fluentui/react-utilities';
 
 /**
  * Text Props
  */
-export interface TextProps extends ComponentProps, React.HTMLAttributes<HTMLElement> {
+export interface TextProps extends ComponentPropsCompat, React.HTMLAttributes<HTMLElement> {
   /*
    * TODO Add props and slots here
    * Any slot property should be listed in the textShorthandProps array below
@@ -20,7 +20,7 @@ export type TextDefaultedProps = never; // TODO add names of properties with def
 /**
  * State used in rendering Text
  */
-export interface TextState extends ComponentState<TextProps, TextDefaultedProps> {
+export interface TextState extends ComponentStateCompat<TextProps, TextDefaultedProps> {
   /**
    * Ref to the root element
    */

diff --git a/packages/react-text/src/components/Text/renderText.tsx b/packages/react-text/src/components/Text/renderText.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { getSlots } from '@fluentui/react-utilities';
+import { getSlotsCompat } from '@fluentui/react-utilities';
 import { TextState } from './Text.types';
 
 /**
  * Render the final JSX of Text
  */
 export const renderText = (state: TextState) => {
-  const { slots, slotProps } = getSlots(state);
+  const { slots, slotProps } = getSlotsCompat(state);
 
   return (
     <slots.root {...slotProps.root}>