diff --git a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/StyledWrapper.js index 3de12e12b..3179cee52 100644 --- a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/StyledWrapper.js +++ b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/StyledWrapper.js @@ -13,10 +13,13 @@ const Wrapper = styled.div` .current-group:hover { background-color: ${(props) => darken(0.03, props.theme.background.surface1)}; border-color: ${(props) => darken(0.03, props.theme.background.surface2)}; + } - /* Fix dropdown positioning */ - [data-tippy-root] { - left: 0 !important; + .advanced-options { + .caret { + color: ${(props) => props.theme.textLink}; + fill: ${(props) => props.theme.textLink}; + } } `; diff --git a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js index 1739a6961..9fdf186f8 100644 --- a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js +++ b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js @@ -15,6 +15,7 @@ import { wsdlToBruno } from '@usebruno/converters'; import { toastError } from 'utils/common/error'; import { addLog } from 'providers/ReduxStore/slices/logs'; import { useBetaFeature, BETA_FEATURES } from 'utils/beta-features'; +import Portal from 'components/Portal'; import Modal from 'components/Modal'; import Help from 'components/Help'; import Dropdown from 'components/Dropdown'; @@ -109,9 +110,11 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, rawData, format, sour const dispatch = useDispatch(); const [groupingType, setGroupingType] = useState('tags'); const [collectionFormat, setCollectionFormat] = useState(DEFAULT_COLLECTION_FORMAT); + const [showFileFormat, setShowFileFormat] = useState(false); const isOpenAPISyncEnabled = useBetaFeature(BETA_FEATURES.OPENAPI_SYNC); const [enableCheckForSpecUpdates, setEnableCheckForSpecUpdates] = useState(isOpenAPISyncEnabled); const dropdownTippyRef = useRef(); + const optionsDropdownTippyRef = useRef(); const isOpenApi = format === 'openapi'; const isZipImport = format === 'bruno-zip'; const isOpenApiFromUrl = isOpenApi && !!sourceUrl && !filePath; @@ -198,6 +201,21 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, rawData, format, sour dropdownTippyRef.current = ref; }; + const onOptionsDropdownCreate = (ref) => { + optionsDropdownTippyRef.current = ref; + }; + + const ImportOptions = forwardRef((props, ref) => { + return ( +