Merge branch 'main' of github.com:invoke-ai/InvokeAI into main

invoke-ai · Jul 3, 2023 · 73a2791 · 73a2791
2 parents 76bafeb + c33f0ae
commit 73a2791
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/invokeai/frontend/web/src/features/gallery/components/ImageContextMenu.tsx b/invokeai/frontend/web/src/features/gallery/components/ImageContextMenu.tsx
@@ -217,13 +217,13 @@ const ImageContextMenu = ({ image, children }: Props) => {
                   {t('parameters.sendToUnifiedCanvas')}
                 </MenuItem>
               )}
-              <MenuItem
+              {/* <MenuItem
                 icon={<FaFolder />}
                 isDisabled={isInBatch}
                 onClickCapture={handleAddToBatch}
               >
                 Add to Batch
-              </MenuItem>
+              </MenuItem> */}
               <MenuItem icon={<FaFolder />} onClickCapture={handleAddToBoard}>
                 {image.board_id ? 'Change Board' : 'Add to Board'}
               </MenuItem>
@@ -252,12 +252,12 @@ const ImageContextMenu = ({ image, children }: Props) => {
               >
                 Move Selection to Board
               </MenuItem>
-              <MenuItem
+              {/* <MenuItem
                 icon={<FaFolderPlus />}
                 onClickCapture={handleAddSelectionToBatch}
               >
                 Add Selection to Batch
-              </MenuItem>
+              </MenuItem> */}
               <MenuItem
                 sx={{ color: 'error.600', _dark: { color: 'error.300' } }}
                 icon={<FaTrash />}

diff --git a/...nd/web/src/features/parameters/components/Parameters/ImageToImage/InitialImageDisplay.tsx b/...nd/web/src/features/parameters/components/Parameters/ImageToImage/InitialImageDisplay.tsx
@@ -114,15 +114,15 @@ const InitialImageDisplay = () => {
           Initial Image
         </Text>
         <Spacer />
-        <IAIButton
+        {/* <IAIButton
           tooltip={useBatchAsInitialImage ? 'Disable Batch' : 'Enable Batch'}
           aria-label={useBatchAsInitialImage ? 'Disable Batch' : 'Enable Batch'}
           leftIcon={<FaLayerGroup />}
           isChecked={useBatchAsInitialImage}
           onClick={handleClickUseBatch}
         >
           {useBatchAsInitialImage ? 'Batch' : 'Single'}
-        </IAIButton>
+        </IAIButton> */}
         <IAIIconButton
           tooltip={
             useBatchAsInitialImage ? 'Upload to Batch' : 'Upload Initial Image'
@@ -146,7 +146,8 @@ const InitialImageDisplay = () => {
           isDisabled={isResetButtonDisabled}
         />
       </Flex>
-      {useBatchAsInitialImage ? <BatchImageContainer /> : <InitialImage />}
+      <InitialImage />
+      {/* {useBatchAsInitialImage ? <BatchImageContainer /> : <InitialImage />} */}
       <input {...getUploadInputProps()} />
     </Flex>
   );

diff --git a/invokeai/frontend/web/src/features/ui/components/InvokeTabs.tsx b/invokeai/frontend/web/src/features/ui/components/InvokeTabs.tsx
@@ -66,11 +66,11 @@ const tabs: InvokeTabInfo[] = [
     icon: <Icon as={MdDeviceHub} sx={{ boxSize: 6, pointerEvents: 'none' }} />,
     content: <NodesTab />,
   },
-  {
-    id: 'batch',
-    icon: <Icon as={FaLayerGroup} sx={{ boxSize: 6, pointerEvents: 'none' }} />,
-    content: <BatchTab />,
-  },
+  // {
+  //   id: 'batch',
+  //   icon: <Icon as={FaLayerGroup} sx={{ boxSize: 6, pointerEvents: 'none' }} />,
+  //   content: <BatchTab />,
+  // },
 ];
 
 const enabledTabsSelector = createSelector(