7 files changed, 139 insertions, 36 deletions

diff --git a/po/en.po b/po/en.po
index 8e690649..89a05939 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1017,6 +1017,15 @@ msgstr "Default"
 msgid "heading.upload.text"
 msgstr "Text"
 
+msgid "menu.upload.export"
+msgstr "Export Text"
+
+msgid "menu.upload.delete"
+msgstr "Delete All"
+
+msgid "menu.upload.delete.confirm"
+msgstr "Really Delete All (No Undo)"
+
 msgid "hint.upload.text"
 msgstr "enter text to upload"
 
diff --git a/src/ios.h b/src/ios.h
index 6c5ec8d5..fbe7c2eb 100644
--- a/src/ios.h
+++ b/src/ios.h
@@ -38,6 +38,7 @@ void    playHapticEffect_iOS    (enum iHapticEffect effect);
 void    exportDownloadedFile_iOS(const iString *path);
 void    pickFileForOpening_iOS  (void);
 void    pickFile_iOS            (const char *command); /* ` path:%s` will be appended */
+void    openTextActivityView_iOS(const iString *text);
 
 iBool   isPhone_iOS             (void);
 void    safeAreaInsets_iOS      (float *left, float *top, float *right, float *bottom);
@@ -79,9 +80,11 @@ iDeclareType(SystemTextInput)
 iDeclareTypeConstructionArgs(SystemTextInput, iRect rect, int flags)
 
 void    setRect_SystemTextInput  (iSystemTextInput *, iRect rect);
-void    setText_SystemTextInput  (iSystemTextInput *, const iString *text);
+void    setText_SystemTextInput  (iSystemTextInput *, const iString *text, iBool allowUndo);
 void    setFont_SystemTextInput  (iSystemTextInput *, int fontId);
-void    setTextChangedFunc_SystemTextInput  (iSystemTextInput *, void (*textChangedFunc)(iSystemTextInput *, void *), void *);
+void    setTextChangedFunc_SystemTextInput
+                                 (iSystemTextInput *, void (*textChangedFunc)(iSystemTextInput *, void *), void *);
+void    selectAll_SystemTextInput(iSystemTextInput *);
 
 const iString * text_SystemTextInput    (const iSystemTextInput *);
 int     preferredHeight_SystemTextInput (const iSystemTextInput *);
diff --git a/src/ios.m b/src/ios.m
index 2705a350..b6fbdec0 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -536,6 +536,15 @@ void pickFile_iOS(const char *command) {
     [viewController_(get_Window()) presentViewController:picker animated:YES completion:nil];
 }
 
+void openTextActivityView_iOS(const iString *text) {
+    UIActivityViewController *actView =
+        [[UIActivityViewController alloc]
+         initWithActivityItems:@[
+            [NSString stringWithUTF8String:cstr_String(text)]]
+         applicationActivities:nil];
+    [viewController_(get_Window()) presentViewController:actView animated:YES completion:nil];
+}
+
 /*----------------------------------------------------------------------------------------------*/
 
 enum iAVFAudioPlayerState {
@@ -784,7 +793,16 @@ void deinit_SystemTextInput(iSystemTextInput *d) {
     }
 }
 
-void setText_SystemTextInput(iSystemTextInput *d, const iString *text) {
+void selectAll_SystemTextInput(iSystemTextInput *d) {
+    if (d->field) {
+        [REF_d_field selectAll:nil];
+    }
+    if (d->view) {
+        [REF_d_view selectAll:nil];
+    }
+}
+
+void setText_SystemTextInput(iSystemTextInput *d, const iString *text, iBool allowUndo) {
     NSString *str = [NSString stringWithUTF8String:cstr_String(text)];
     if (d->field) {
         [REF_d_field setText:str];
@@ -793,9 +811,22 @@ void setText_SystemTextInput(iSystemTextInput *d, const iString *text) {
         }
     }
     else {
-        [REF_d_view setText:str];
+        UITextView *view = REF_d_view;
+//        if (allowUndo) {
+//            [view selectAll:nil];
+//            if ([view shouldChangeTextInRange:[view selectedTextRange] replacementText:@""]) {
+//                [[view textStorage] beginEditing];
+//                [[view textStorage] replaceCharactersInRange:[view selectedRange] withString:@""];
+//                [[view textStorage] endEditing];
+//            }
+//        }
+//        else {
+        // TODO: How to implement `allowUndo`, given that UITextView does not exist when unfocused?
+        // Maybe keep the UITextStorage (if it has the undo?)?
+        [view setText:str];
+//        }
         if (d->flags & selectAll_SystemTextInputFlags) {
-            [REF_d_view selectAll:nil];
+            [view selectAll:nil];
         }
     }
 }
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 3be6a383..22f983eb 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -715,7 +715,8 @@ static void updateAllLinesAndResizeHeight_InputWidget_(iInputWidget *d) {
     const int height = measure_WrapText(&wt, d->font).bounds.size.y;
     /* We use this to store the number wrapped lines for determining widget height. */
     d->visWrapLines.start = 0;
-    d->visWrapLines.end = iMin(d->maxWrapLines, height / lineHeight_Text(d->font));
+    d->visWrapLines.end = iMax(d->minWrapLines,
+                               iMin(d->maxWrapLines, height / lineHeight_Text(d->font)));
     updateMetrics_InputWidget_(d);
 }
 
@@ -733,8 +734,10 @@ static int contentHeight_InputWidget_(const iInputWidget *d) {
     if (d->buffered && ~d->inFlags & needUpdateBuffer_InputWidgetFlag) {
         return iClamp(d->buffered->size.y, minHeight, maxHeight);
     }
-#endif
+    return minHeight;
+#else
     return (int) size_Range(&d->visWrapLines) * lineHeight;
+#endif
 }
 
 static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
@@ -1111,7 +1114,7 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
 #else
     set_String(&d->text, nfcText);
     if (d->sysCtrl) {
-        setText_SystemTextInput(d->sysCtrl, nfcText);
+        setText_SystemTextInput(d->sysCtrl, nfcText, iTrue);
     }
     else {
         updateAllLinesAndResizeHeight_InputWidget_(d); /* need to know the new height */
@@ -1134,7 +1137,11 @@ void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
 }
 
 void selectAll_InputWidget(iInputWidget *d) {
-#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    if (d->sysCtrl) {
+        selectAll_SystemTextInput(d->sysCtrl);
+    }
+#else
     d->mark = (iRanges){ 0, lastLine_InputWidget_(d)->range.end };
     refresh_Widget(as_Widget(d));
 #endif
@@ -1177,7 +1184,7 @@ void begin_InputWidget(iInputWidget *d) {
                                      (isAllowedToInsertNewline_InputWidget_(d) ? insertNewlines_SystemTextInputFlag : 0) |
                                      (d->inFlags & selectAllOnFocus_InputWidgetFlag ? selectAll_SystemTextInputFlags : 0));
     setFont_SystemTextInput(d->sysCtrl, d->font);
-    setText_SystemTextInput(d->sysCtrl, &d->oldText);
+    setText_SystemTextInput(d->sysCtrl, &d->oldText, iFalse);
     setTextChangedFunc_SystemTextInput(d->sysCtrl, systemInputChanged_InputWidget_, d);
     iConnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
     updateTextInputRect_InputWidget_(d);
@@ -2157,10 +2164,6 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "input.selectall") && isEditing_InputWidget_(d)) {
-        selectAll_InputWidget(d);
-        return iTrue;
-    }
     else if (isCommand_UserEvent(ev, "text.insert")) {
         pushUndo_InputWidget_(d);
         deleteMarked_InputWidget_(d);
@@ -2169,6 +2172,10 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         return iTrue;
     }
 #endif
+    else if (isCommand_UserEvent(ev, "input.selectall") && isEditing_InputWidget_(d)) {
+        selectAll_InputWidget(d);
+        return iTrue;
+    }
     else if (isCommand_UserEvent(ev, "theme.changed")) {
         if (d->buffered) {
             d->inFlags |= needUpdateBuffer_InputWidgetFlag;
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 9e0d37e4..5ad43b0e 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -134,6 +134,10 @@ static iBool processEvent_LabelWidget_(iLabelWidget *d, const SDL_Event *ev) {
         refresh_Widget(d);
         return iFalse;
     }
+    else if (isCommand_Widget(w, ev, "trigger")) {
+        trigger_LabelWidget_(d);
+        return iTrue;
+    }
     if (!isEmpty_String(&d->command)) {
 #if 0 && defined (iPlatformAppleMobile)
         /* Touch allows activating any button on release. */
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index e11970ec..58106dcb 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -92,17 +92,19 @@ static void updateProgress_UploadWidget_(iGmRequest *request, size_t current, si
 static void updateInputMaxHeight_UploadWidget_(iUploadWidget *d) {
     iWidget *w = as_Widget(d);    
     /* Calculate how many lines fits vertically in the view. */
-    const iInt2 inputPos     = topLeft_Rect(bounds_Widget(as_Widget(d->input)));
-    const int   footerHeight = isUsingPanelLayout_Mobile() ? 0 :
-                                (height_Widget(d->token) +
-                                 height_Widget(findChild_Widget(w, "dialogbuttons")) +
-                                 12 * gap_UI);
-    const int   avail        = bottom_Rect(safeRect_Root(w->root)) - footerHeight -
-                               get_MainWindow()->keyboardHeight;
-    setLineLimits_InputWidget(d->input,
-                              minLines_InputWidget(d->input),
-                              iMaxi(minLines_InputWidget(d->input),
-                                    (avail - inputPos.y) / lineHeight_Text(font_InputWidget(d->input))));
+    const iInt2 inputPos = topLeft_Rect(bounds_Widget(as_Widget(d->input)));
+    int footerHeight = 0;
+    if (!isUsingPanelLayout_Mobile()) {
+        footerHeight = (height_Widget(d->token) +
+                        height_Widget(findChild_Widget(w, "dialogbuttons")) +
+                        12 * gap_UI);
+    }
+    const int avail = bottom_Rect(visibleRect_Root(w->root)) - footerHeight - inputPos.y;
+    /* On desktop, retain the previously set minLines value. */
+    int minLines = isUsingPanelLayout_Mobile() ? 1 : minLines_InputWidget(d->input);
+    int maxLines = iMaxi(minLines, avail / lineHeight_Text(font_InputWidget(d->input)));
+    /* On mobile, the height is fixed to the available space. */
+    setLineLimits_InputWidget(d->input, isUsingPanelLayout_Mobile() ? maxLines : minLines, maxLines);
 }
 
 static const iGmIdentity *titanIdentityForUrl_(const iString *url) {
@@ -208,11 +210,7 @@ void init_UploadWidget(iUploadWidget *d) {
             enableUploadButton_UploadWidget_(d, iFalse);
         }
         iWidget *title = findChild_Widget(w, "heading.upload.text");
-        iLabelWidget *menu = makeMenuButton_LabelWidget(midEllipsis_Icon, (iMenuItem[]){
-            { export_Icon " ${upload.text.export}", 0, 0, "upload.text.export" },
-            { "---" },
-            { delete_Icon " " uiTextCaution_ColorEscape "${menu.delete}", 0, 0, "upload.text.delete" }
-        }, 3);
+        iLabelWidget *menu = new_LabelWidget(midEllipsis_Icon, "upload.editmenu.open");
         setTextColor_LabelWidget(menu, uiTextAction_ColorId);
         setFont_LabelWidget(menu, uiLabelBigBold_FontId);
         addChildFlags_Widget(title, iClob(menu), frameless_WidgetFlag | moveToParentRightEdge_WidgetFlag);
@@ -428,12 +426,19 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
     }
     else if (equal_Command(cmd, "panel.changed")) {
         showOrHideUploadButton_UploadWidget_(d);
-        setFocus_Widget(NULL);
+        if (currentPanelIndex_Mobile(w) == 0) {
+            setFocus_Widget(as_Widget(d->input));
+        }
+        else {
+            setFocus_Widget(NULL);
+        }
+        refresh_Widget(d->input);
         return iFalse;
     }
 #if defined (iPlatformAppleMobile)
     else if (deviceType_App() != desktop_AppDeviceType && equal_Command(cmd, "menu.opened")) {
         setFocus_Widget(NULL); /* overlaid text fields! */
+        refresh_Widget(d->input);
         return iFalse;
     }
 #endif
@@ -474,6 +479,44 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         updateIdentityDropdown_UploadWidget_(d);
         return iTrue;
     }
+    if (isCommand_Widget(w, ev, "upload.editmenu.open")) {
+        setFocus_Widget(NULL);
+        refresh_Widget(as_Widget(d->input));
+        iWidget *editMenu = makeMenu_Widget(root_Widget(w), (iMenuItem[]){
+            { select_Icon " ${menu.selectall}", 0, 0, "upload.text.selectall" },
+            { export_Icon " ${menu.upload.export}", 0, 0, "upload.text.export" },
+            { "---" },
+            { delete_Icon " " uiTextCaution_ColorEscape "${menu.upload.delete}", 0, 0, "upload.text.delete" }
+        }, 4);
+        openMenu_Widget(editMenu, topLeft_Rect(bounds_Widget(as_Widget(d->input))));
+        return iTrue;
+    }
+    if (isCommand_UserEvent(ev, "upload.text.export")) {
+#if defined (iPlatformAppleMobile)
+        openTextActivityView_iOS(text_InputWidget(d->input));
+#endif
+        return iTrue;
+    }
+    if (isCommand_UserEvent(ev, "upload.text.delete")) {
+        if (argLabel_Command(command_UserEvent(ev), "confirmed")) {
+            setTextCStr_InputWidget(d->input, "");
+            setFocus_Widget(as_Widget(d->input));
+        }
+        else {
+            iWidget *confirm = makeMenu_Widget(root_Widget(w), (iMenuItem[]){
+                { delete_Icon " " uiTextCaution_ColorEscape "${menu.upload.delete.confirm}", 0, 0,
+                    "upload.text.delete confirmed:1" }
+                }, 1);
+            openMenu_Widget(confirm, zero_I2());
+        }
+        return iTrue;
+    }
+    if (isCommand_UserEvent(ev, "upload.text.selectall")) {
+        setFocus_Widget(as_Widget(d->input));
+        refresh_Widget(as_Widget(d->input));
+        postCommand_Widget(d->input, "input.selectall");
+        return iTrue;
+    }
     if (isCommand_Widget(w, ev, "upload.accept")) {
         iBool isText;
         iWidget *tabs = findChild_Widget(w, "upload.tabs");
@@ -569,11 +612,16 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         destroy_Widget(w);
         return iTrue;        
     }
-    else if (!isUsingPanelLayout_Mobile() && isCommand_Widget(w, ev, "input.resized")) {
-        resizeToLargestPage_Widget(findChild_Widget(w, "upload.tabs"));
-        arrange_Widget(w);
-        refresh_Widget(w);
-        return iTrue;
+    else if (isCommand_Widget(w, ev, "input.resized")) {
+        if (!isUsingPanelLayout_Mobile()) {
+            resizeToLargestPage_Widget(findChild_Widget(w, "upload.tabs"));
+            arrange_Widget(w);
+            refresh_Widget(w);
+            return iTrue;
+        }
+        else {
+            refresh_Widget(as_Widget(d->input));
+        }
     }
     else if (isCommand_Widget(w, ev, "upload.pickfile")) {
 #if defined (iPlatformAppleMobile)
diff --git a/src/ui/util.c b/src/ui/util.c
index 73fafe84..daefc279 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -671,6 +671,7 @@ static iBool isCommandIgnoredByMenus_(const char *cmd) {
            equal_Command(cmd, "window.reload.update") ||
            equal_Command(cmd, "window.mouse.exited") ||
            equal_Command(cmd, "window.mouse.entered") ||
+           equal_Command(cmd, "input.backup") ||
            (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
 }