From a613ae60fa346b422e61adf8f515db76ca83d5e2 Mon Sep 17 00:00:00 2001
From: Ben White <ben@posthog.com>
Date: Fri, 22 Mar 2024 13:41:49 +0100
Subject: [PATCH] merge fixes

---
 .../sidepanel/panels/access_control/AccessControlObject.tsx   | 3 ---
 .../src/lib/lemon-ui/LemonInputSelect/LemonInputSelect.tsx    | 4 +---
 2 files changed, 1 insertion(+), 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
index 899fb0f991397..8dcff45165587 100644
--- 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
index 089501051d2ec..9e5240a275a68 100644
--- 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)