From 0ffc06454b66fdea9423d13cea9a7d59c40dd2f0 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 5 Apr 2022 15:56:42 -0700
Subject: [PATCH] Use the MobileEdit layout for editing labels

---
 packages/web/pages/settings/labels.tsx | 108 ++++++++++++++++---------
 1 file changed, 71 insertions(+), 37 deletions(-)

diff --git a/packages/web/pages/settings/labels.tsx b/packages/web/pages/settings/labels.tsx
index dff2acf28..aeb0877e3 100644
--- a/packages/web/pages/settings/labels.tsx
+++ b/packages/web/pages/settings/labels.tsx
@@ -339,6 +339,7 @@ export default function LabelsPage(): JSX.Element {
                 setIsCreateMode={setIsCreateMode}
                 createLabel={createLabel}
                 resetState={resetLabelState}
+                updateLabel={updateLabel}
               />
             )
           ) : null}
@@ -348,32 +349,53 @@ export default function LabelsPage(): JSX.Element {
             const isLastChild = i === labels.length - 1
             const isFirstChild = i === 0
 
+            if (windowWidth <= breakpoint && editingLabelId == label.id) {
               return (
-                <GenericTableCard
-                  key={label.id}
-                  isLastChild={isLastChild}
-                  isFirstChild={isFirstChild}
-                  label={label as unknown as Label}
-                  labelColorHex={labelColorHex}
-                  editingLabelId={editingLabelId}
-                  isCreateMode={isCreateMode}
-                  handleGenerateRandomColor={handleGenerateRandomColor}
-                  setEditingLabelId={setEditingLabelId}
-                  setLabelColorHex={setLabelColorHex}
-                  deleteLabel={deleteLabel}
-                  nameInputText={nameInputText}
-                  descriptionInputText={descriptionInputText}
-                  setNameInputText={setNameInputText}
-                  setDescriptionInputText={setDescriptionInputText}
-                  setIsCreateMode={setIsCreateMode}
-                  createLabel={createLabel}
-                  updateLabel={updateLabel}
-                  onEditPress={onEditPress}
-                  resetState={resetLabelState}
-                />
-              )
-            })
-          : null}
+                <MobileEditCard
+                label={label}
+                labelColorHex={labelColorHex}
+                editingLabelId={editingLabelId}
+                isCreateMode={isCreateMode}
+                handleGenerateRandomColor={handleGenerateRandomColor}
+                setEditingLabelId={setEditingLabelId}
+                setLabelColorHex={setLabelColorHex}
+                deleteLabel={deleteLabel}
+                nameInputText={nameInputText}
+                descriptionInputText={descriptionInputText}
+                setNameInputText={setNameInputText}
+                setDescriptionInputText={setDescriptionInputText}
+                setIsCreateMode={setIsCreateMode}
+                createLabel={createLabel}
+                resetState={resetLabelState}
+                updateLabel={updateLabel}
+              />)
+            }
+
+            return (
+              <GenericTableCard
+                key={label.id}
+                isLastChild={isLastChild}
+                isFirstChild={isFirstChild}
+                label={label as unknown as Label}
+                labelColorHex={labelColorHex}
+                editingLabelId={editingLabelId}
+                isCreateMode={isCreateMode}
+                handleGenerateRandomColor={handleGenerateRandomColor}
+                setEditingLabelId={setEditingLabelId}
+                setLabelColorHex={setLabelColorHex}
+                deleteLabel={deleteLabel}
+                nameInputText={nameInputText}
+                descriptionInputText={descriptionInputText}
+                setNameInputText={setNameInputText}
+                setDescriptionInputText={setDescriptionInputText}
+                setIsCreateMode={setIsCreateMode}
+                createLabel={createLabel}
+                updateLabel={updateLabel}
+                onEditPress={onEditPress}
+                resetState={resetLabelState}
+              />
+            )
+          }) : null}
       </VStack>
     </PrimaryLayout>
   )
@@ -709,15 +731,26 @@ function MobileEditCard(props: any) {
     setNameInputText,
     setDescriptionInputText,
     createLabel,
-    resetState
+    resetState,
+    updateLabel
   } = props
+
+  const handleEdit = () => {
+    editingLabelId && updateLabel(editingLabelId)
+    setEditingLabelId(null)
+  }
+
   return (
     <TableCard>
-      <VStack distribution="center" css={{ width: '100%' }}>
-        <StyledText>{editingLabelId ? 'Edit Label' : 'New Label'}</StyledText>
+      <VStack distribution="center" css={{ width: '100%', margin: '8px' }}>
+        {nameInputText && (
+          <SpanBox css={{ ml: '13px', mt: '1px' }}>
+            <LabelChip color={labelColorHex.value} text={nameInputText} />
+          </SpanBox>
+        )}
         <Input
           type="text"
-          value={nameInputText || label?.name}
+          value={nameInputText}
           onChange={(event) => setNameInputText(event.target.value)}
           autoFocus
         />
@@ -731,7 +764,8 @@ function MobileEditCard(props: any) {
           setLabelColorHex={setLabelColorHex}
         />
         <TextArea
-          value={descriptionInputText || label?.description}
+          placeholder={label?.description}
+          value={descriptionInputText}
           onChange={(event) => setDescriptionInputText(event.target.value)}
           rows={5}
         />
@@ -740,13 +774,6 @@ function MobileEditCard(props: any) {
           alignment="center"
           css={{ width: '100%', margin: '$1 0' }}
         >
-          <Button
-            style="ctaDarkYellow"
-            css={{ mr: '$1' }}
-            onClick={() => (label ? setEditingLabelId(null) : createLabel())}
-          >
-            Save
-          </Button>
           <Button
             style="plainIcon"
             css={{ mr: '$1' }}
@@ -756,6 +783,13 @@ function MobileEditCard(props: any) {
           >
             Cancel
           </Button>
+          <Button
+            style="ctaDarkYellow"
+            css={{ mr: '$1' }}
+            onClick={() => label ? handleEdit() : createLabel()}
+          >
+            Save
+          </Button>
         </HStack>
       </VStack>
     </TableCard>