diff --git a/packages/bruno-app/src/components/RequestTabs/ExampleTab/index.js b/packages/bruno-app/src/components/RequestTabs/ExampleTab/index.js index 7b9490f93..cf98ad6a7 100644 --- a/packages/bruno-app/src/components/RequestTabs/ExampleTab/index.js +++ b/packages/bruno-app/src/components/RequestTabs/ExampleTab/index.js @@ -74,7 +74,7 @@ const ExampleTab = ({ tab, collection }) => { } return ( - + {showConfirmClose && ( { /> )}
dispatch(makeTabPermanent({ uid: tab.uid }))} onMouseUp={(e) => { diff --git a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js index a277d5129..3cbb6d736 100644 --- a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js +++ b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js @@ -33,7 +33,7 @@ const Wrapper = styled.div` } ul { - padding: 0 2px; + padding: 0 3px; margin: 0; display: flex; align-items: flex-end; @@ -122,13 +122,13 @@ const Wrapper = styled.div` &::before { content: ''; position: absolute; - bottom: -1px; + bottom: 1px; left: -8px; width: 8px; height: 8px; background: transparent; - border-bottom-right-radius: 8px; - box-shadow: 2px 2px 0 0 ${(props) => props.theme.bg || '#ffffff'}; + border-bottom-right-radius: 6px; + box-shadow: 3px 3px 0 0 ${(props) => props.theme.bg || '#ffffff'}; border-right: 1px solid ${(props) => props.theme.requestTabs.bottomBorder}; border-bottom: 1px solid ${(props) => props.theme.requestTabs.bottomBorder}; } @@ -136,13 +136,13 @@ const Wrapper = styled.div` &::after { content: ''; position: absolute; - bottom: -1px; + bottom: 1px; right: -8px; width: 8px; height: 8px; background: transparent; - border-bottom-left-radius: 8px; - box-shadow: -2px 2px 0 0 ${(props) => props.theme.bg || '#ffffff'}; + border-bottom-left-radius: 6px; + box-shadow: -3px 3px 0 0 ${(props) => props.theme.bg || '#ffffff'}; border-left: 1px solid ${(props) => props.theme.requestTabs.bottomBorder}; border-bottom: 1px solid ${(props) => props.theme.requestTabs.bottomBorder}; } diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js index f174e6ed1..927198558 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js @@ -26,6 +26,7 @@ const ExampleItem = ({ example, item, collection }) => { const [showRenameModal, setShowRenameModal] = useState(false); const [showDeleteModal, setShowDeleteModal] = useState(false); const dropdownTippyRef = useRef(null); + const exampleRef = useRef(null); // Calculate indentation: item depth + 1 for examples const indents = range((item.depth || 0) + 1); @@ -57,6 +58,16 @@ const ExampleItem = ({ example, item, collection }) => { setEditName(example.name); }, [example.name]); + useEffect(() => { + if (isExampleActive && exampleRef.current) { + try { + exampleRef.current.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); + } catch (err) { + // ignore scroll errors + } + } + }, [isExampleActive]); + const handleClone = async () => { // Calculate the index where the cloned example will be saved // It will be at the end of the examples array @@ -137,6 +148,7 @@ const ExampleItem = ({ example, item, collection }) => { return ( { dragPreview(getEmptyImage(), { captureDraggingState: true }); }, []); + useEffect(() => { + if (isCollectionFocused && collectionRef.current) { + try { + collectionRef.current.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); + } catch (err) { + // ignore scroll errors + } + } + }, [isCollectionFocused]); + if (searchText && searchText.length) { if (!doesCollectionHaveItemsMatchingSearchText(collection, searchText)) { return null; diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceOverview/CollectionsList/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceOverview/CollectionsList/StyledWrapper.js index f085487ae..92cd93165 100644 --- a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceOverview/CollectionsList/StyledWrapper.js +++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceOverview/CollectionsList/StyledWrapper.js @@ -41,7 +41,6 @@ const StyledWrapper = styled.div` align-items: center; gap: 10px; padding: 10px 0; - background: ${(props) => props.theme.workspace.card.bg}; border-bottom: 1px solid ${(props) => props.theme.sidebar.collection.item.hoverBg}; cursor: pointer; diff --git a/packages/bruno-app/src/components/WorkspaceSidebar/CreateWorkspace/index.js b/packages/bruno-app/src/components/WorkspaceSidebar/CreateWorkspace/index.js index 1d24ac168..3686180a0 100644 --- a/packages/bruno-app/src/components/WorkspaceSidebar/CreateWorkspace/index.js +++ b/packages/bruno-app/src/components/WorkspaceSidebar/CreateWorkspace/index.js @@ -8,6 +8,7 @@ import { createWorkspaceAction } from 'providers/ReduxStore/slices/workspaces/ac import { browseDirectory } from 'providers/ReduxStore/slices/collections/actions'; import { multiLineMsg } from 'utils/common/index'; import { formatIpcError } from 'utils/common/error'; +import Help from 'components/Help'; const CreateWorkspace = ({ onClose }) => { const inputRef = useRef(); @@ -106,13 +107,16 @@ const CreateWorkspace = ({ onClose }) => {
-