From ef302aefb145cbe95580bba279eed9a6b4a4883a Mon Sep 17 00:00:00 2001 From: Lawrence Win Date: Fri, 7 Jun 2024 13:59:35 -0700 Subject: [PATCH 1/3] Fix directional hint typo --- packages/components/Callout/src/Callout.settings.macos.ts | 2 +- packages/components/Callout/src/Callout.settings.ts | 2 +- packages/components/Callout/src/Callout.types.ts | 2 +- packages/components/Callout/src/CalloutNativeComponent.ts | 4 ++-- .../components/Callout/src/MacOSCalloutNativeComponent.ts | 2 +- .../ContextualMenu/src/ContextualMenu.settings.macos.ts | 2 +- .../components/ContextualMenu/src/ContextualMenu.settings.ts | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/components/Callout/src/Callout.settings.macos.ts b/packages/components/Callout/src/Callout.settings.macos.ts index 9ba96a9912..eaeac88d7e 100644 --- a/packages/components/Callout/src/Callout.settings.macos.ts +++ b/packages/components/Callout/src/Callout.settings.macos.ts @@ -10,7 +10,7 @@ export const settings: IComposeSettings = [ borderColor: 'transparent', borderWidth: 0, borderRadius: 5, - directionalHint: 'bottonLeftEdge', + directionalHint: 'bottomLeftEdge', }, root: { style: { diff --git a/packages/components/Callout/src/Callout.settings.ts b/packages/components/Callout/src/Callout.settings.ts index 917feb0a0d..6b21d133bf 100644 --- a/packages/components/Callout/src/Callout.settings.ts +++ b/packages/components/Callout/src/Callout.settings.ts @@ -10,7 +10,7 @@ export const settings: IComposeSettings = [ beakWidth: 20, borderColor: 'bodyFrameBackground', borderWidth: 1, - directionalHint: 'bottonLeftEdge', + directionalHint: 'bottomLeftEdge', gapSpace: 0, minPadding: 0, }, diff --git a/packages/components/Callout/src/Callout.types.ts b/packages/components/Callout/src/Callout.types.ts index caa3cbb24e..8b2d7b7c64 100644 --- a/packages/components/Callout/src/Callout.types.ts +++ b/packages/components/Callout/src/Callout.types.ts @@ -22,7 +22,7 @@ export type DirectionalHint = | 'rightTopEdge' | 'rightCenter' | 'rightBottomEdge' - | 'bottonLeftEdge' + | 'bottomLeftEdge' | 'bottomAutoEdge' | 'bottomCenter' | 'bottomRightEdge'; diff --git a/packages/components/Callout/src/CalloutNativeComponent.ts b/packages/components/Callout/src/CalloutNativeComponent.ts index d31a3a71dc..c3fe97062f 100644 --- a/packages/components/Callout/src/CalloutNativeComponent.ts +++ b/packages/components/Callout/src/CalloutNativeComponent.ts @@ -35,11 +35,11 @@ export interface NativeProps extends ViewProps { | 'rightTopEdge' | 'rightCenter' | 'rightBottomEdge' - | 'bottonLeftEdge' + | 'bottomLeftEdge' | 'bottomAutoEdge' | 'bottomCenter' | 'bottomRightEdge', - 'bottonLeftEdge' + 'bottomLeftEdge' >; dismissBehaviors?: string[]; doNotTakePointerCapture?: boolean; diff --git a/packages/components/Callout/src/MacOSCalloutNativeComponent.ts b/packages/components/Callout/src/MacOSCalloutNativeComponent.ts index 6f1200366e..f551cd0252 100644 --- a/packages/components/Callout/src/MacOSCalloutNativeComponent.ts +++ b/packages/components/Callout/src/MacOSCalloutNativeComponent.ts @@ -31,7 +31,7 @@ export interface NativeProps extends ViewProps { | 'rightTopEdge' | 'rightCenter' | 'rightBottomEdge' - | 'bottonLeftEdge' + | 'bottomLeftEdge' | 'bottomAutoEdge' | 'bottomCenter' | 'bottomRightEdge', diff --git a/packages/components/ContextualMenu/src/ContextualMenu.settings.macos.ts b/packages/components/ContextualMenu/src/ContextualMenu.settings.macos.ts index 9b474c0786..16992a0a5b 100644 --- a/packages/components/ContextualMenu/src/ContextualMenu.settings.macos.ts +++ b/packages/components/ContextualMenu/src/ContextualMenu.settings.macos.ts @@ -8,7 +8,7 @@ import { contextualMenuName } from './ContextualMenu.types'; export const settings: IComposeSettings = [ { tokens: { - directionalHint: I18nManager.isRTL ? 'bottomRightEdge' : 'bottonLeftEdge', + directionalHint: I18nManager.isRTL ? 'bottomRightEdge' : 'bottomLeftEdge', }, container: { style: { diff --git a/packages/components/ContextualMenu/src/ContextualMenu.settings.ts b/packages/components/ContextualMenu/src/ContextualMenu.settings.ts index 6c88a1f22d..e1f21bdbd8 100644 --- a/packages/components/ContextualMenu/src/ContextualMenu.settings.ts +++ b/packages/components/ContextualMenu/src/ContextualMenu.settings.ts @@ -10,7 +10,7 @@ export const settings: IComposeSettings = [ beakWidth: 20, borderColor: 'buttonBorder', borderWidth: 1, - directionalHint: 'bottonLeftEdge', + directionalHint: 'bottomLeftEdge', gapSpace: 0, minPadding: 0, }, From 4a037e2d6ff1d5eb5b962d372603213ca12eb9cd Mon Sep 17 00:00:00 2001 From: Lawrence Win Date: Fri, 7 Jun 2024 14:00:35 -0700 Subject: [PATCH 2/3] Change files --- ...ative-callout-50213cd4-3583-401a-b8cc-d16cde4e24bc.json | 7 +++++++ ...ntextual-menu-b276b61c-0bd8-4a39-a199-ddc13dee546a.json | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 change/@fluentui-react-native-callout-50213cd4-3583-401a-b8cc-d16cde4e24bc.json create mode 100644 change/@fluentui-react-native-contextual-menu-b276b61c-0bd8-4a39-a199-ddc13dee546a.json diff --git a/change/@fluentui-react-native-callout-50213cd4-3583-401a-b8cc-d16cde4e24bc.json b/change/@fluentui-react-native-callout-50213cd4-3583-401a-b8cc-d16cde4e24bc.json new file mode 100644 index 0000000000..d42868d295 --- /dev/null +++ b/change/@fluentui-react-native-callout-50213cd4-3583-401a-b8cc-d16cde4e24bc.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix typo in `DirectionalHint` type", + "packageName": "@fluentui-react-native/callout", + "email": "winlarry@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-contextual-menu-b276b61c-0bd8-4a39-a199-ddc13dee546a.json b/change/@fluentui-react-native-contextual-menu-b276b61c-0bd8-4a39-a199-ddc13dee546a.json new file mode 100644 index 0000000000..a69177aa65 --- /dev/null +++ b/change/@fluentui-react-native-contextual-menu-b276b61c-0bd8-4a39-a199-ddc13dee546a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix typo in `DirectionalHint` type", + "packageName": "@fluentui-react-native/contextual-menu", + "email": "winlarry@microsoft.com", + "dependentChangeType": "patch" +} From 7596f90d373bd3582782ae15cc011d1f8711c9d1 Mon Sep 17 00:00:00 2001 From: Lawrence Win Date: Fri, 7 Jun 2024 17:28:37 -0700 Subject: [PATCH 3/3] Add missing file --- packages/components/Callout/macos/FRNCalloutManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/Callout/macos/FRNCalloutManager.m b/packages/components/Callout/macos/FRNCalloutManager.m index 404d2e24ab..296deafc71 100644 --- a/packages/components/Callout/macos/FRNCalloutManager.m +++ b/packages/components/Callout/macos/FRNCalloutManager.m @@ -26,7 +26,7 @@ + (NSRect)screenRect:(id)json @"rightTopEdge": @(NSRectEdgeMaxX), @"rightCenter": @(NSRectEdgeMaxX), @"rightBottomEdge": @(NSRectEdgeMaxX), - @"bottonLeftEdge": @(NSRectEdgeMinY), + @"bottomLeftEdge": @(NSRectEdgeMinY), @"bottomAutoEdge": @(NSRectEdgeMinY), @"bottomCenter": @(NSRectEdgeMinY), @"bottomRightEdge": @(NSRectEdgeMinY),