@idealyst/components 1.2.47 → 1.2.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/components",
-  "version": "1.2.47",
+  "version": "1.2.49",
   "description": "Shared component library for React and React Native",
   "documentation": "https://github.com/IdealystIO/idealyst-framework/tree/main/packages/components#readme",
   "readme": "README.md",
@@ -56,7 +56,7 @@
     "publish:npm": "npm publish"
   },
   "peerDependencies": {
-    "@idealyst/theme": "^1.2.47",
+    "@idealyst/theme": "^1.2.49",
     "@mdi/js": ">=7.0.0",
     "@mdi/react": ">=1.0.0",
     "@react-native-vector-icons/common": ">=12.0.0",
@@ -107,7 +107,7 @@
   },
   "devDependencies": {
     "@idealyst/blur": "^1.2.40",
-    "@idealyst/theme": "^1.2.47",
+    "@idealyst/theme": "^1.2.49",
     "@idealyst/tooling": "^1.2.30",
     "@mdi/react": "^1.6.1",
     "@types/react": "^19.1.0",

package/src/Dialog/Dialog.native.tsx

@@ -147,48 +147,43 @@ const Dialog = forwardRef<View, DialogProps>(({
     bottom: 0,
   };
 
-  const dialogContainer = (
-    <TouchableWithoutFeedback onPress={(e: GestureResponderEvent) => e.stopPropagation()}>
-      <Animated.View ref={ref as any} style={[containerStyle, style, containerAnimatedStyle]} nativeID={id} {...nativeA11yProps}>
-        {(title || showCloseButton) && (
-          <View style={headerStyle}>
-            {title && (
-              <Text style={titleStyle}>
-                {title}
-              </Text>
-            )}
-            {showCloseButton && (
-              <TouchableOpacity
-                style={closeButtonStyle}
-                onPress={handleClosePress}
-                accessibilityLabel="Close dialog"
-                accessibilityRole="button"
-              >
-                <Text style={closeButtonTextStyle}>×</Text>
-              </TouchableOpacity>
-            )}
-          </View>
-        )}
-        <View style={contentStyle}>
-          {children}
+  const dialogContent = (
+    <Animated.View ref={ref as any} style={[containerStyle, style, containerAnimatedStyle]} nativeID={id} {...nativeA11yProps}>
+      {(title || showCloseButton) && (
+        <View style={headerStyle}>
+          {title && (
+            <Text style={titleStyle}>
+              {title}
+            </Text>
+          )}
+          {showCloseButton && (
+            <TouchableOpacity
+              style={closeButtonStyle}
+              onPress={handleClosePress}
+              accessibilityLabel="Close dialog"
+              accessibilityRole="button"
+            >
+              <Text style={closeButtonTextStyle}>×</Text>
+            </TouchableOpacity>
+          )}
         </View>
-      </Animated.View>
-    </TouchableWithoutFeedback>
+      )}
+      <View style={contentStyle}>
+        {children}
+      </View>
+    </Animated.View>
   );
 
-  const modalContent = (
-    <TouchableWithoutFeedback onPress={handleBackdropPress}>
-      {BackdropComponent ? (
-        <View style={customBackdropWrapperStyle}>
-          <Animated.View style={[customBackdropContainerStyle, backdropAnimatedStyle]}>
-            <BackdropComponent isVisible={open} />
-          </Animated.View>
-          {dialogContainer}
-        </View>
+  const dialogContainer = (
+    <TouchableWithoutFeedback onPress={(e: GestureResponderEvent) => e.stopPropagation()}>
+      {avoidKeyboard ? (
+        <KeyboardAvoidingView
+          behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        >
+          {dialogContent}
+        </KeyboardAvoidingView>
       ) : (
-        <Animated.View style={[backdropStyle, backdropAnimatedStyle]}>
-          {dialogContainer}
-        </Animated.View>
+        dialogContent
       )}
     </TouchableWithoutFeedback>
   );
@@ -202,16 +197,20 @@ const Dialog = forwardRef<View, DialogProps>(({
       statusBarTranslucent
       testID={testID}
     >
-      {avoidKeyboard ? (
-        <KeyboardAvoidingView
-          style={{ flex: 1 }}
-          behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-        >
-          {modalContent}
-        </KeyboardAvoidingView>
-      ) : (
-        modalContent
-      )}
+      <TouchableWithoutFeedback onPress={handleBackdropPress}>
+        {BackdropComponent ? (
+          <View style={customBackdropWrapperStyle}>
+            <Animated.View style={[customBackdropContainerStyle, backdropAnimatedStyle]}>
+              <BackdropComponent isVisible={open} />
+            </Animated.View>
+            {dialogContainer}
+          </View>
+        ) : (
+          <Animated.View style={[backdropStyle, backdropAnimatedStyle]}>
+            {dialogContainer}
+          </Animated.View>
+        )}
+      </TouchableWithoutFeedback>
     </Modal>
   );
 });