- fixed Modal contain IOSHoldMenu bugs

htyf-mp-community · Dec 31, 2021 · 2467bd8 · 2467bd8
1 parent 470f8d4
commit 2467bd8
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 24 deletions.
diff --git a/src/components/@/ant-design/action-sheet/AndroidContainer.js b/src/components/@/ant-design/action-sheet/AndroidContainer.js
@@ -29,13 +29,8 @@ class ActionSheetAndroid extends React.PureComponent {
   }
   render() {
     const { config, onAnimationEnd } = this.props
-    const {
-      title,
-      message,
-      options,
-      destructiveButtonIndex,
-      cancelButtonIndex
-    } = config
+    const { title, message, options, destructiveButtonIndex, cancelButtonIndex } =
+      config
 
     return (
       <WithTheme themeStyles={ActionSheetStyles} styles={this.props.styles}>
@@ -58,11 +53,8 @@ class ActionSheetAndroid extends React.PureComponent {
           )
           const content = options.map((item, index) => (
             <View
-              // eslint-disable-next-line react/no-array-index-key
               key={index}
-              style={[
-                cancelButtonIndex === index ? styles.cancelBtn : undefined
-              ]}
+              style={[cancelButtonIndex === index ? styles.cancelBtn : undefined]}
             >
               <TouchableHighlight
                 style={[styles.btn]}

diff --git a/src/components/popover/index.android.js b/src/components/popover/index.android.js
@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2019-12-14 16:28:46
  * @Last Modified by: czy0729
- * @Last Modified time: 2021-12-28 22:42:12
+ * @Last Modified time: 2021-12-31 19:21:24
  */
 import React from 'react'
 import { observer } from 'mobx-react'

diff --git a/src/screens/_/base/folder-manage-modal.js b/src/screens/_/base/folder-manage-modal.js
@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2021-05-27 14:20:46
  * @Last Modified by: czy0729
- * @Last Modified time: 2021-12-30 08:30:49
+ * @Last Modified time: 2021-12-31 19:31:06
  */
 import React from 'react'
 import { Alert, BackHandler, ScrollView, View } from 'react-native'
@@ -794,15 +794,15 @@ export const FolderManageModal = ob(
                     onPress={() => this.onToggle(item, detail, isIn)}
                   />
                 )}
-                <Popover
+                <Popover.Old
                   style={this.styles.btnPopover}
                   data={controlDS.root}
                   onSelect={title => this.onControl(title, item)}
                 >
                   <Flex style={this.styles.touch} justify='center'>
                     <Iconfont name='md-more-vert' size={18} color={_.colorSub} />
                   </Flex>
-                </Popover>
+                </Popover.Old>
               </>
             )}
             {item.id == create && (
@@ -938,15 +938,15 @@ export const FolderManageModal = ob(
                     </View>
                   )}
                   {!edit && !create && (
-                    <Popover
+                    <Popover.Old
                       style={this.styles.btnPopover}
                       data={data}
                       onSelect={title => this.onSubjectControl(title, i, item)}
                     >
                       <Flex style={this.styles.touch} justify='center'>
                         <Iconfont name='md-more-vert' size={18} color={_.colorSub} />
                       </Flex>
-                    </Popover>
+                    </Popover.Old>
                   )}
                 </Flex>
               </Flex>

diff --git a/src/screens/_/base/popover.js b/src/screens/_/base/popover.js
@@ -2,14 +2,15 @@
  * @Author: czy0729
  * @Date: 2019-06-01 18:25:07
  * @Last Modified by: czy0729
- * @Last Modified time: 2021-11-15 20:55:03
+ * @Last Modified time: 2021-12-31 19:30:22
  */
 import React from 'react'
 import { Popover as CompPopover, Menu } from '@components'
+import { Popover as CompPopoverOld } from '@components/popover/old'
 import { ob } from '@utils/decorators'
 import { IOS } from '@constants'
 
-export const Popover = ob(
+const Popover = ob(
   ({ data = [], menuStyle, onSelect = Function.prototype, children, ...other }) => {
     const popoverProps = IOS
       ? {
@@ -25,10 +26,38 @@ export const Popover = ob(
           data,
           onSelect
         }
+
     return (
       <CompPopover placement='bottom' {...popoverProps} {...other}>
         {children}
       </CompPopover>
     )
   }
 )
+
+Popover.Old = ob(
+  ({ data = [], menuStyle, onSelect = Function.prototype, children, ...other }) => {
+    const popoverProps = IOS
+      ? {
+          overlay: (
+            <Menu
+              style={menuStyle}
+              data={data}
+              onSelect={title => setTimeout(() => onSelect(title), 0)}
+            />
+          )
+        }
+      : {
+          data,
+          onSelect
+        }
+
+    return (
+      <CompPopoverOld placement='bottom' {...popoverProps} {...other}>
+        {children}
+      </CompPopoverOld>
+    )
+  }
+)
+
+export { Popover }
diff --git a/src/screens/tinygrail/_/characters-modal/index.js b/src/screens/tinygrail/_/characters-modal/index.js
@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2020-06-28 14:02:31
  * @Last Modified by: czy0729
- * @Last Modified time: 2021-11-23 04:35:46
+ * @Last Modified time: 2021-12-31 19:31:44
  */
 import React from 'react'
 import { BackHandler, View, Alert, StatusBar } from 'react-native'
@@ -792,7 +792,7 @@ class CharactersModal extends React.Component {
 
   renderFilter(filter, data, map, onSelect) {
     return (
-      <Popover
+      <Popover.Old
         data={data}
         hitSlop={hitSlop}
         onSelect={title => {
@@ -811,7 +811,7 @@ class CharactersModal extends React.Component {
             {map[filter] ? ` (${map[filter]})` : ''}
           </Text>
         </Flex>
-      </Popover>
+      </Popover.Old>
     )
   }
 

diff --git a/src/screens/tinygrail/items/index.js b/src/screens/tinygrail/items/index.js
@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2020-03-05 17:59:15
  * @Last Modified by: czy0729
- * @Last Modified time: 2021-11-21 02:36:09
+ * @Last Modified time: 2021-12-31 19:18:04
  */
 import React from 'react'
 import { ScrollView, View } from 'react-native'

diff --git a/tsconfig.json b/tsconfig.json
@@ -13,7 +13,9 @@
       "@constants": ["src/constants"],
       "@constants/*": ["src/constants/*"],
       "@styles": ["src/styles"],
-      "@styles/*": ["src/styles/*"]
+      "@styles/*": ["src/styles/*"],
+      "@tinygrail": ["src/screens/tinygrail"],
+      "@tinygrail/*": ["src/screens/tinygrail/*"]
     },
     "allowJs": true,
     "esModuleInterop": true,