From ff87f237336a3b3aee0cc5382c028fe2315447ae Mon Sep 17 00:00:00 2001 From: Dominic Go <18517029+dominicstop@users.noreply.github.com> Date: Mon, 20 Jun 2022 01:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AD=90=EF=B8=8F=20Impl:=20Aux.=20Preview=20-?= =?UTF-8?q?=20`width`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update MenuAuxiliaryPreviewConfig.ts --- .../RNIContextMenu/RNIContextMenuAuxiliaryPreviewConfig.swift | 2 ++ .../ReactNative/RNIContextMenuView/RNIContextMenuView.swift | 4 ++-- src/types/MenuAuxiliaryPreviewConfig.ts | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ios/src/ReactNative/RNIContextMenu/RNIContextMenuAuxiliaryPreviewConfig.swift b/ios/src/ReactNative/RNIContextMenu/RNIContextMenuAuxiliaryPreviewConfig.swift index 6c78aec..0c1f73e 100644 --- a/ios/src/ReactNative/RNIContextMenu/RNIContextMenuAuxiliaryPreviewConfig.swift +++ b/ios/src/ReactNative/RNIContextMenu/RNIContextMenuAuxiliaryPreviewConfig.swift @@ -141,6 +141,7 @@ struct RNIContextMenuAuxiliaryPreviewConfig { // ------------------ var height: CGFloat?; + var width: CGFloat?; var anchorPosition: AnchorPosition; var alignmentHorizontal: HorizontalAlignment; @@ -156,6 +157,7 @@ struct RNIContextMenuAuxiliaryPreviewConfig { init(dictionary: NSDictionary){ self.height = dictionary["height"] as? CGFloat; + self.width = dictionary["width" ] as? CGFloat; self.anchorPosition = { guard let string = dictionary["anchorPosition"] as? String, diff --git a/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuView.swift b/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuView.swift index 44395d0..f0e1275 100644 --- a/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuView.swift +++ b/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuView.swift @@ -539,9 +539,9 @@ fileprivate extension RNIContextMenuView { case .stretchPreview: return morphingPlatterView.frame.width - adj; - // C - Infer aux preview width from view... + // C - Infer aux config or aux preview width from view... default: - return previewAuxiliaryView.frame.width; + return auxConfig.width ?? previewAuxiliaryView.frame.width; }; }(); diff --git a/src/types/MenuAuxiliaryPreviewConfig.ts b/src/types/MenuAuxiliaryPreviewConfig.ts index 93fcf3f..ef836cf 100644 --- a/src/types/MenuAuxiliaryPreviewConfig.ts +++ b/src/types/MenuAuxiliaryPreviewConfig.ts @@ -49,8 +49,7 @@ export type MenuAuxiliaryPreviewTransitionEntranceDelay = export type MenuAuxiliaryPreviewConfig = { height?: number; - // TODO: Make optional - if null determine width from component view height - // width?: number; + width?: number; anchorPosition?: MenuAuxiliaryPreviewAnchorPosition; alignmentHorizontal?: MenuAuxiliaryPreviewHorizontalAlignment;