merge fixes

PostHog · Mar 22, 2024 · a613ae6 · a613ae6
1 parent 3086bdd
commit a613ae6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/AccessControlObject.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/AccessControlObject.tsx
@@ -416,9 +416,6 @@ function AddItemsControls(props: {
                     mode="multiple"
                     options={props.options}
                     disabled={!canEditAccessControls}
-                    dropdownProps={{
-                        sameWidth: false,
-                    }}
                 />
             </div>
             <SimplLevelComponent levels={availableLevels} level={level} onChange={setLevel} />

diff --git a/frontend/src/lib/lemon-ui/LemonInputSelect/LemonInputSelect.tsx b/frontend/src/lib/lemon-ui/LemonInputSelect/LemonInputSelect.tsx
@@ -8,7 +8,7 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { KeyboardShortcut } from '~/layout/navigation-3000/components/KeyboardShortcut'
 
 import { LemonButton } from '../LemonButton'
-import { LemonDropdown, LemonDropdownProps } from '../LemonDropdown'
+import { LemonDropdown } from '../LemonDropdown'
 import { LemonInput } from '../LemonInput'
 import { PopoverReferenceContext } from '../Popover'
 
@@ -30,7 +30,6 @@ export type LemonInputSelectProps = {
     onChange?: (newValue: string[]) => void
     onInputChange?: (newValue: string) => void
     'data-attr'?: string
-    dropdownProps?: Partial<LemonDropdownProps>
 }
 
 export function LemonInputSelect({
@@ -44,7 +43,6 @@ export function LemonInputSelect({
     disabled,
     disableFiltering = false,
     allowCustomValues = false,
-    dropdownProps = {},
     ...props
 }: LemonInputSelectProps): JSX.Element {
     const [showPopover, setShowPopover] = useState(false)