From 6b606da0fdbe0cd0e16336b60665834c2972bb2e Mon Sep 17 00:00:00 2001 From: Dominic Go <18517029+dominicstop@users.noreply.github.com> Date: Tue, 30 Nov 2021 07:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AD=90=EF=B8=8F=20Impl.=20`ContextMenuView.i?= =?UTF-8?q?sContextMenuEnabled`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcshareddata/xcschemes/IosContextMenuExample.xcscheme | 2 +- .../RNIContextMenuButton/RNIContextMenuButtonManager.m | 6 +++--- .../ReactNative/RNIContextMenuView/RNIContextMenuView.swift | 4 ++++ .../RNIContextMenuView/RNIContextMenuViewManager.m | 2 ++ src/components/ContextMenuView.tsx | 1 + src/native_components/RNIContextMenuView.ts | 2 ++ 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/example/ios/IosContextMenuExample.xcodeproj/xcshareddata/xcschemes/IosContextMenuExample.xcscheme b/example/ios/IosContextMenuExample.xcodeproj/xcshareddata/xcschemes/IosContextMenuExample.xcscheme index 11116d1..faf8097 100644 --- a/example/ios/IosContextMenuExample.xcodeproj/xcshareddata/xcschemes/IosContextMenuExample.xcscheme +++ b/example/ios/IosContextMenuExample.xcodeproj/xcshareddata/xcschemes/IosContextMenuExample.xcscheme @@ -54,7 +54,7 @@ UIContextMenuConfiguration? { + guard self.isContextMenuEnabled else { return nil }; + self.onMenuWillCreate?([:]); return UIContextMenuConfiguration( diff --git a/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuViewManager.m b/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuViewManager.m index 36537bc..3aa9b1d 100644 --- a/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuViewManager.m +++ b/ios/src/ReactNative/RNIContextMenuView/RNIContextMenuViewManager.m @@ -35,4 +35,6 @@ RCT_EXPORT_VIEW_PROPERTY(previewConfig, NSDictionary); RCT_EXPORT_VIEW_PROPERTY(shouldUseDiscoverabilityTitleAsFallbackValueForSubtitle, BOOL); +RCT_EXPORT_VIEW_PROPERTY(isContextMenuEnabled, BOOL); + @end diff --git a/src/components/ContextMenuView.tsx b/src/components/ContextMenuView.tsx index c9a0c6b..14e6613 100644 --- a/src/components/ContextMenuView.tsx +++ b/src/components/ContextMenuView.tsx @@ -23,6 +23,7 @@ export type ContextMenuViewBaseProps = Pick