Merge pull request #3973 from tloncorp/po/tlon-2756-move-channel-add-…

…button-to-header move the 'add' button in notebook/gallery to header
tloncorp · Oct 1, 2024 · c674414 · c674414
2 parents 4eeba6d + 59fd83b
commit c674414
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 28 deletions.
diff --git a/packages/ui/src/components/Channel/ChannelHeader.tsx b/packages/ui/src/components/Channel/ChannelHeader.tsx
@@ -15,6 +15,8 @@ export function ChannelHeader({
   goBack,
   goToSearch,
   showSpinner,
+  showAddButton = false,
+  onPressAddButton,
   showSearchButton = true,
   showMenuButton = false,
 }: {
@@ -25,6 +27,8 @@ export function ChannelHeader({
   goBack?: () => void;
   goToSearch?: () => void;
   showSpinner?: boolean;
+  showAddButton?: boolean;
+  onPressAddButton?: () => void;
   showSearchButton?: boolean;
   showMenuButton?: boolean;
   post?: db.Post;
@@ -56,6 +60,15 @@ export function ChannelHeader({
                 <Icon type="Search" />
               </Button>
             )}
+            {showAddButton && (
+              <Button
+                backgroundColor="unset"
+                borderColor="transparent"
+                onPress={onPressAddButton}
+              >
+                <Icon type="Add" />
+              </Button>
+            )}
             {showMenuButton && (
               <Button
                 backgroundColor="unset"

diff --git a/packages/ui/src/components/Channel/index.tsx b/packages/ui/src/components/Channel/index.tsx
@@ -282,6 +282,14 @@ export function Channel({
                         showBigInput ? bigInputGoBack() : goBack()
                       }
                       showSearchButton={isChatChannel}
+                      showAddButton={
+                        !isChatChannel && canWrite && !showBigInput
+                      }
+                      onPressAddButton={() =>
+                        channel.type === 'gallery'
+                          ? setShowAddGalleryPost(true)
+                          : setShowBigInput(true)
+                      }
                       goToSearch={goToSearch}
                       showSpinner={isLoadingPosts}
                       showMenuButton={true}
@@ -395,34 +403,6 @@ export function Channel({
                               showAttachmentButton={channel.type !== 'gallery'}
                             />
                           )}
-                        {!isChatChannel && canWrite && !showBigInput && (
-                          <View
-                            position="absolute"
-                            bottom={bottom}
-                            flex={1}
-                            width="100%"
-                            alignItems="center"
-                          >
-                            {channel.type === 'gallery' &&
-                            (showAddGalleryPost ||
-                              isUploadingGalleryImage) ? null : (
-                              <FloatingActionButton
-                                onPress={() =>
-                                  channel.type === 'gallery'
-                                    ? setShowAddGalleryPost(true)
-                                    : setShowBigInput(true)
-                                }
-                                icon={
-                                  <Icon
-                                    type="Add"
-                                    size={'$s'}
-                                    marginRight={'$s'}
-                                  />
-                                }
-                              />
-                            )}
-                          </View>
-                        )}
                         {!negotiationMatch && isChatChannel && canWrite && (
                           <NegotionMismatchNotice />
                         )}