fix: make image width and height necessary

Author: kacperzolkiewski

android/src/main/java/com/swmansion/enriched/EnrichedTextInputView.kt

@@ -527,7 +527,7 @@ class EnrichedTextInputView : AppCompatEditText {
     parametrizedStyles?.setLinkSpan(start, end, text, url)
   }
 
-  fun addImage(src: String, width: Float?, height: Float?) {
+  fun addImage(src: String, width: Float, height: Float) {
     val isValid = verifyStyle(EnrichedSpans.IMAGE)
     if (!isValid) return
 

android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt

@@ -170,7 +170,7 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     }
   }
 
-  fun setImageSpan(src: String, width: Float?, height: Float?) {
+  fun setImageSpan(src: String, width: Float, height: Float) {
     if (view.selection == null) return
 
     val spannable = view.text as SpannableStringBuilder
@@ -188,10 +188,7 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
 
     val uri = Uri.fromFile(File(src))
 
-    val imageWidth = width ?: view.htmlStyle.imgWidth
-    val imageHeight = height ?: view.htmlStyle.imgHeight
-
-    val span = EnrichedImageSpan(view.context, uri, imageWidth.toInt(), imageHeight.toInt())
+    val span = EnrichedImageSpan(view.context, uri, width.toInt(), height.toInt())
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
     spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
   }

example/src/App.tsx

@@ -207,7 +207,7 @@ export default function App() {
     closeValueModal();
   };
 
-  const selectImage = async (width?: number, height?: number) => {
+  const selectImage = async (width: number, height: number) => {
     const response = await launchImageLibrary({
       mediaType: 'photo',
       selectionLimit: 1,

example/src/components/ImageModal.tsx

@@ -6,7 +6,7 @@ import { Icon } from './Icon';
 interface ImageModalProps {
   isOpen: boolean;
   onClose: () => void;
-  onSubmit: (width?: number, height?: number) => void;
+  onSubmit: (width: number, height: number) => void;
 }
 
 export const ImageModal: FC<ImageModalProps> = ({
@@ -20,8 +20,8 @@ export const ImageModal: FC<ImageModalProps> = ({
   const handleSave = () => {
     const parsedWidth = parseFloat(width);
     const parsedHeight = parseFloat(height);
-    const finalWidth = isNaN(parsedWidth) ? undefined : parsedWidth;
-    const finalHeight = isNaN(parsedHeight) ? undefined : parsedHeight;
+    const finalWidth = isNaN(parsedWidth) ? 0 : parsedWidth;
+    const finalHeight = isNaN(parsedHeight) ? 0 : parsedHeight;
 
     onSubmit(finalWidth, finalHeight);
   };

ios/EnrichedTextInputView.mm

@@ -808,11 +808,8 @@ - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
     [self toggleParagraphStyle:[CodeBlockStyle getStyleType]];
   } else if([commandName isEqualToString:@"addImage"]) {
     NSString *uri = (NSString *)args[0];
-    NSNumber *widthNum = ((NSNumber*)args[1]);
-    NSNumber *heightNum = ((NSNumber*)args[2]);
-    
-    CGFloat imgWidth = [widthNum isKindOfClass:[NSNull class]] ? config.imageWidth : [widthNum floatValue];
-    CGFloat imgHeight = [heightNum isKindOfClass:[NSNull class]] ? config.imageHeight : [heightNum floatValue];
+    CGFloat imgWidth = [(NSNumber*)args[1] floatValue];
+    CGFloat imgHeight = [(NSNumber*)args[2] floatValue];
 
     [self addImage:uri width:imgWidth height:imgHeight];
   }

src/EnrichedTextInput.tsx

@@ -52,7 +52,7 @@ export interface EnrichedTextInputInstance extends NativeMethods {
   toggleOrderedList: () => void;
   toggleUnorderedList: () => void;
   setLink: (start: number, end: number, text: string, url: string) => void;
-  setImage: (src: string, width?: number, height?: number) => void;
+  setImage: (src: string, width: number, height: number) => void;
   startMention: (indicator: string) => void;
   setMention: (
     indicator: string,
@@ -272,13 +272,8 @@ export const EnrichedTextInput = ({
     setLink: (start: number, end: number, text: string, url: string) => {
       Commands.addLink(nullthrows(nativeRef.current), start, end, text, url);
     },
-    setImage: (uri: string, width?: number, height?: number) => {
-      Commands.addImage(
-        nullthrows(nativeRef.current),
-        uri,
-        width ?? null,
-        height ?? null
-      );
+    setImage: (uri: string, width: number, height: number) => {
+      Commands.addImage(nullthrows(nativeRef.current), uri, width, height);
     },
     setMention: (
       indicator: string,

src/EnrichedTextInputNativeComponent.ts

@@ -194,8 +194,8 @@ interface NativeCommands {
   addImage: (
     viewRef: React.ElementRef<ComponentType>,
     uri: string,
-    width: Float | null,
-    height: Float | null
+    width: Float,
+    height: Float
   ) => void;
   startMention: (
     viewRef: React.ElementRef<ComponentType>,