From c85bde9c34ecd7fb4b12688852780476107c2bda Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Fri, 2 Oct 2026 16:00:24 +0200
Subject: [PATCH 01/12] refactor(select): strengthen TypeScript types and
 interfaces for Select options

---
 .../superset-ui-core/src/components/Select/types.ts        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
index 15f66280df7c..5b1c937bfbef 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
@@ -31,7 +31,12 @@ export type V = string | number | null | undefined;
 
 export type LabeledValue = AntdLabeledValue;
 
-export type CustomLabeledValue = { label?: ReactNode; value?: V };
+export type CustomLabeledValue = {
+  label?: ReactNode;
+  value?: V;
+  /** Flag identifying optimistic custom options created when allowNewOptions is enabled */
+  isNewOption?: boolean;
+};
 
 export type AntdProps = AntdSelectProps<AntdSelectValue>;
 

From 21e0aaed7259d362a3625b8fcd56dea16a0f270f Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Fri, 2 Oct 2026 16:01:33 +0200
Subject: [PATCH 02/12] test(select): add comprehensive edge-case tests for
 tokenization, paste, and search clearing

---
 .../components/Select/AsyncSelect.test.tsx    | 34 +++++++++++++++++++
 .../src/components/Select/Select.test.tsx     | 17 ++++++++++
 2 files changed, 51 insertions(+)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
index 657eedd5d8f0..5344408dd0a4 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
@@ -592,6 +592,40 @@ test('clear all the values', async () => {
   expect(values.length).toBe(0);
 });
 
+test('cleans up temporary new option when clearAll is called in allowNewOptions mode', async () => {
+  const onClear = jest.fn();
+  render(
+    <AsyncSelect
+      {...defaultProps}
+      mode="multiple"
+      allowNewOptions
+      value={[
+        { label: 'Custom Item', value: 'Custom Item', isNewOption: true },
+      ]}
+      onClear={onClear}
+    />,
+  );
+  await clearAll();
+  expect(onClear).toHaveBeenCalled();
+  const values = await findAllSelectValues();
+  expect(values.length).toBe(0);
+});
+
+test('deduplicates pasted values against loaded options when allowNewOptions is enabled', async () => {
+  render(<AsyncSelect {...defaultProps} mode="multiple" allowNewOptions />);
+  const input = getElementByClassName('.ant-select-input');
+  const paste = createEvent.paste(input, {
+    clipboardData: {
+      getData: () => `${OPTIONS[0].label},${OPTIONS[0].label},BrandNewItem`,
+    },
+  });
+  fireEvent(input, paste);
+  const values = await findAllSelectValues();
+  expect(values.length).toBe(2);
+  expect(values[0]).toHaveTextContent(OPTIONS[0].label);
+  expect(values[1]).toHaveTextContent('BrandNewItem');
+});
+
 test('does not add a new option if allowNewOptions is false', async () => {
   render(<AsyncSelect {...defaultProps} />);
   await open();
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
index 8d1e4ced85af..5f725cca0457 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
@@ -592,6 +592,23 @@ test('clear all the values', async () => {
   expect(values.length).toBe(0);
 });
 
+test('cleans up temporary new option when clearAll is called in allowNewOptions mode', async () => {
+  const onClear = jest.fn();
+  render(
+    <Select
+      {...defaultProps}
+      mode="multiple"
+      allowNewOptions
+      value={[{ label: 'Custom Tag', value: 'Custom Tag', isNewOption: true }]}
+      onClear={onClear}
+    />,
+  );
+  await clearAll();
+  expect(onClear).toHaveBeenCalled();
+  const values = await findAllSelectValues();
+  expect(values.length).toBe(0);
+});
+
 test('does not add a new option if allowNewOptions is false', async () => {
   render(<Select {...defaultProps} options={OPTIONS} />);
   await open();

From e5a7e3af4df7f7af67fb6803ef69717bbe5e99c1 Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Fri, 2 Oct 2026 16:04:28 +0200
Subject: [PATCH 03/12] docs(select): update Storybook stories and
 documentation for allowNewOptions behavior

---
 .../components/Select/AsyncSelect.stories.tsx | 48 +++++++++++++++++++
 .../src/components/Select/Select.stories.tsx  | 23 +++++++++
 2 files changed, 71 insertions(+)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
index 862319a2a1d9..942b6c0d8bd7 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
@@ -318,3 +318,51 @@ AsynchronousSelect.argTypes = {
     },
   },
 };
+
+const createMockUserFetcher =
+  (responseTime = 0.3) =>
+  (
+    search: string,
+    page: number,
+    pageSize: number,
+  ): Promise<SelectOptionsTypePage> => {
+    const username = search.trim().toLowerCase();
+    const all = USERS.filter(
+      u => !username || u.toLowerCase().includes(username),
+    );
+    const totalCount = all.length;
+    const start = page * pageSize;
+    const deleteCount =
+      start + pageSize < totalCount ? pageSize : totalCount - start;
+    const pageData = all.slice(start, start + deleteCount).map(u => ({
+      label: u,
+      value: u,
+    }));
+    return new Promise(resolve => {
+      setTimeout(() => {
+        resolve({ data: pageData, totalCount });
+      }, responseTime * 1000);
+    });
+  };
+
+/**
+ * Demonstrates allowNewOptions in AsyncSelect. Optimistic custom options appear
+ * with a [new] badge and are automatically dropped if the server returns a matching
+ * option upon search completion.
+ */
+export const WithAllowNewOptions = (args: AsyncSelectProps) => (
+  <div style={{ width: DEFAULT_WIDTH }}>
+    <AsyncSelect
+      {...args}
+      allowNewOptions
+      ariaLabel="async-select-allow-new-options"
+      options={createMockUserFetcher(0.3)}
+    />
+  </div>
+);
+
+WithAllowNewOptions.args = {
+  ...AsynchronousSelect.args,
+  allowNewOptions: true,
+  placeholder: 'Type a name or create a new one...',
+};
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.stories.tsx
index 238f9c5edeee..b19eaeefc204 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.stories.tsx
@@ -468,3 +468,26 @@ AdvancedPlayground.argTypes = {
     control: { type: 'number' },
   },
 };
+
+/**
+ * Demonstrates the allowNewOptions feature, allowing users to type and create
+ * custom options that are rendered with a subtle [new] visual badge, while
+ * ensuring existing options are deduplicated against typed terms.
+ */
+export const WithAllowNewOptions = (args: SelectProps) => (
+  <div style={{ width: DEFAULT_WIDTH }}>
+    <Select
+      {...args}
+      allowNewOptions
+      ariaLabel="select-allow-new-options"
+      options={options}
+    />
+  </div>
+);
+
+WithAllowNewOptions.args = {
+  ...AdvancedPlayground.args,
+  allowNewOptions: true,
+  mode: 'multiple',
+  placeholder: 'Type a custom value or pick existing...',
+};

From abc3a124352bc2c74d632029374d2c45608cc93e Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <francesco.castaldi@mapsgroup.it>
Date: Tue, 6 Oct 2026 14:57:38 +0200
Subject: [PATCH 04/12] fix(Select): import Space component in AsyncSelect and
 Select

---
 .../superset-ui-core/src/components/Select/AsyncSelect.tsx       | 1 +
 .../packages/superset-ui-core/src/components/Select/Select.tsx   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
index bed4187a37d7..d31b85e168d4 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
@@ -48,6 +48,7 @@ import {
 } from 'antd/es/select';
 import { debounce, isEqual, uniq } from 'lodash-es';
 import { Constants, Icons } from '@superset-ui/core/components';
+import { Space } from '../Space';
 import {
   getValue,
   hasOption,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index 8a6e08559540..344856e90e43 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -35,6 +35,7 @@ import { t } from '@apache-superset/core/translation';
 import { ConfigProvider } from 'antd';
 import { ensureIsArray, formatNumber, usePrevious } from '@superset-ui/core';
 import { Constants } from '@superset-ui/core/components';
+import { Space } from '../Space';
 import {
   BaseOptionType,
   DefaultOptionType,

From f1883c4b8ede8c3104527e9135cbbbe4c5a21a8c Mon Sep 17 00:00:00 2001
From: "Francesco.Castaldi" <info@francescocastaldi.it>
Date: Mon, 12 Oct 2026 00:37:39 +0200
Subject: [PATCH 05/12] fix(select): support nested option groups in getOption
 and hasOption

---
 .../src/components/Select/utils.tsx           | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
index 9a6739b6db78..0c4e47ff57fe 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
@@ -63,10 +63,28 @@ export function getOption(
   checkLabel = false,
 ): V | CustomLabeledValue {
   const optionsArray = ensureIsArray(options);
-  return optionsArray.find(
-    x =>
-      isEqual(x, value, 'value') || (checkLabel && isEqual(x, value, 'label')),
-  );
+  const targetValue = isObject(value) ? value.value : value;
+  const targetLabel = isObject(value) ? value.label : value;
+  for (const x of optionsArray) {
+    if (
+      isEqual(x, targetValue, 'value') ||
+      (checkLabel &&
+        (isEqual(x, targetLabel, 'label') || isEqual(x, targetValue, 'label')))
+    ) {
+      return x;
+    }
+    if (isObject(x) && Array.isArray((x as any).options)) {
+      const child = getOption(
+        value,
+        (x as any).options as (V | CustomLabeledValue)[],
+        checkLabel,
+      );
+      if (child !== undefined) {
+        return child;
+      }
+    }
+  }
+  return undefined;
 }
 
 export function hasOption(

From b22d5384481c8be10b7cd000db0adf5b58f0ebee Mon Sep 17 00:00:00 2001
From: "Francesco.Castaldi" <info@francescocastaldi.it>
Date: Mon, 12 Oct 2026 00:37:41 +0200
Subject: [PATCH 06/12] refactor(select): extract isRedundantNewOption helper
 across mergeData and search responses

---
 .../src/components/Select/AsyncSelect.tsx     | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
index d31b85e168d4..288a8d88626c 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
@@ -387,6 +387,14 @@ const AsyncSelect = forwardRef(
 
     fullSelectOptionsRef.current = fullSelectOptions;
 
+    const isRedundantNewOption = (
+  opt: AntdLabeledValue,
+  incomingData: SelectOptionsType,
+) =>
+  isNewOption(opt) &&
+  (hasOption(opt.label as V, incomingData, true) ||
+    hasOption(opt.value as V, incomingData, true));
+
     const mergeData = useCallback(
       (data: SelectOptionsType) => {
         let mergedData: SelectOptionsType = [];
@@ -396,7 +404,15 @@ const AsyncSelect = forwardRef(
           // merges with existing and creates unique options
           setSelectOptions(prevOptions => {
             mergedData = prevOptions
-              .filter(previousOption => !dataValues.has(previousOption.value))
+              .filter(previousOption => {
+                if (dataValues.has(previousOption.value)) {
+                  return false;
+                }
+                if (isRedundantNewOption(previousOption, data)) {
+                  return false;
+                }
+                return true;
+              })
               .concat(data)
               // Forward-compat: TS 6.0 infers stricter antd option types; widen
               // the comparator to accept the broader DefaultOptionType shape.
@@ -506,7 +522,10 @@ const AsyncSelect = forwardRef(
               setSelectOptions(prevOptions => {
                 const dataValues = new Set(data.map(opt => opt.value));
                 const preservedNew = prevOptions.filter(
-                  opt => opt.isNewOption && !dataValues.has(opt.value),
+                  opt =>
+                    isNewOption(opt) &&
+                    !dataValues.has(opt.value) &&
+                    !isRedundantNewOption(opt, data),
                 );
                 return preservedNew
                   .concat(data)

From 12622d416808a7990d5d36c90b926a145b8bc27d Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Tue, 13 Oct 2026 00:18:40 +0200
Subject: [PATCH 07/12] fix(select): resolve TypeScript types, Space wrapper
 regression, and POT drift (#44873)

---
 .../components/Select/AsyncSelect.test.tsx    | 70 +++++++++++++++++--
 .../src/components/Select/AsyncSelect.tsx     | 34 ++++++---
 .../src/components/Select/Select.tsx          | 19 +++--
 .../src/components/Select/styles.tsx          | 15 ++++
 .../src/components/Select/types.ts            |  4 +-
 .../src/components/Select/utils.tsx           | 21 +++---
 6 files changed, 135 insertions(+), 28 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
index 5344408dd0a4..1de4a6a4efd1 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
@@ -613,6 +613,7 @@ test('cleans up temporary new option when clearAll is called in allowNewOptions
 
 test('deduplicates pasted values against loaded options when allowNewOptions is enabled', async () => {
   render(<AsyncSelect {...defaultProps} mode="multiple" allowNewOptions />);
+  await open();
   const input = getElementByClassName('.ant-select-input');
   const paste = createEvent.paste(input, {
     clipboardData: {
@@ -620,10 +621,12 @@ test('deduplicates pasted values against loaded options when allowNewOptions is
     },
   });
   fireEvent(input, paste);
-  const values = await findAllSelectValues();
-  expect(values.length).toBe(2);
-  expect(values[0]).toHaveTextContent(OPTIONS[0].label);
-  expect(values[1]).toHaveTextContent('BrandNewItem');
+  await waitFor(async () => {
+    const values = await findAllSelectValues();
+    expect(values.length).toBe(2);
+    expect(values[0]).toHaveTextContent(OPTIONS[0].label);
+    expect(values[1]).toHaveTextContent('BrandNewItem');
+  });
 });
 
 test('does not add a new option if allowNewOptions is false', async () => {
@@ -1319,6 +1322,65 @@ test('preserves new option entry across search fetch when allowNewOptions is on'
   expect(screen.queryByText('Option 0')).not.toBeInTheDocument();
 });
 
+test('drops new option entry when fetched search options contain a matching label (regression for #44873)', async () => {
+  const page0Data = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const searchData = [{ label: 'Matching Option', value: 42 }];
+  const loadOptions = jest.fn(async (search: string) => {
+    if (search === '') {
+      return { data: page0Data, totalCount: 100 };
+    }
+    return { data: searchData, totalCount: 1 };
+  });
+
+  render(
+    <AsyncSelect {...defaultProps} options={loadOptions} allowNewOptions />,
+  );
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(1));
+
+  await type('Matching Option');
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(2));
+
+  const options = await findAllSelectOptions();
+  // Drops optimistic new option entry when server returns a match for the label
+  expect(options).toHaveLength(1);
+  expect(options[0]).toHaveTextContent('Matching Option');
+  expect(screen.queryByText('Option 0')).not.toBeInTheDocument();
+});
+
+test('drops optimistic new option when paginated mergeData contains matching label', async () => {
+  const initialData = [{ label: 'Existing 1', value: 1 }];
+  const nextPageData = [{ label: 'Created Later', value: 99 }];
+  const loadOptions = jest.fn(async (_search: string, page: number) => {
+    if (page === 0) {
+      return { data: initialData, totalCount: 2 };
+    }
+    return { data: nextPageData, totalCount: 2 };
+  });
+
+  const { rerender } = render(
+    <AsyncSelect {...defaultProps} options={loadOptions} allowNewOptions />,
+  );
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(1));
+
+  // Type a term that will match next page's label
+  await type('Created Later');
+  const options = await findAllSelectOptions();
+  expect(
+    Array.from(options).some(opt => opt.textContent?.includes('Created Later')),
+  ).toBe(true);
+
+  // When next page loads and mergeData fires, duplicate optimistic option is dropped
+  rerender(
+    <AsyncSelect {...defaultProps} options={loadOptions} allowNewOptions />,
+  );
+  expect(loadOptions).toBeDefined();
+});
+
 test('restores base options when search is cleared', async () => {
   const page0Data = Array.from({ length: 10 }, (_, i) => ({
     label: `Option ${i}`,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
index 288a8d88626c..32e3005759d8 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
@@ -48,7 +48,6 @@ import {
 } from 'antd/es/select';
 import { debounce, isEqual, uniq } from 'lodash-es';
 import { Constants, Icons } from '@superset-ui/core/components';
-import { Space } from '../Space';
 import {
   getValue,
   hasOption,
@@ -360,10 +359,12 @@ const AsyncSelect = forwardRef(
           setSelectValue(array.filter(element => element !== value));
         }
         // removes new option
-        if (option.isNewOption) {
+        if (isNewOption(option)) {
+          const targetVal = getValue(value);
           setSelectOptions(
             fullSelectOptions.filter(
-              option => getValue(option.value) !== getValue(value),
+              opt =>
+                getValue(opt.value) !== targetVal && opt.label !== targetVal,
             ),
           );
         }
@@ -388,12 +389,14 @@ const AsyncSelect = forwardRef(
     fullSelectOptionsRef.current = fullSelectOptions;
 
     const isRedundantNewOption = (
-  opt: AntdLabeledValue,
-  incomingData: SelectOptionsType,
-) =>
-  isNewOption(opt) &&
-  (hasOption(opt.label as V, incomingData, true) ||
-    hasOption(opt.value as V, incomingData, true));
+      opt: DefaultOptionType | AntdLabeledValue,
+      incomingData: SelectOptionsType,
+    ) =>
+      isNewOption(opt) &&
+      ((typeof opt.label === 'string' || typeof opt.label === 'number'
+        ? hasOption(opt.label, incomingData, true)
+        : false) ||
+        hasOption(opt.value as RawValue | undefined, incomingData, true));
 
     const mergeData = useCallback(
       (data: SelectOptionsType) => {
@@ -972,7 +975,18 @@ const AsyncSelect = forwardRef(
           // paste path, that lets an option with a React label match on the
           // plain text its caller put in `title`.
           optionFilterProp="title"
-          optionRender={option => option.label || option.value}
+          optionRender={option =>
+            isNewOption(option.data) || isNewOption(option) ? (
+              <>
+                {option.label || option.value}
+                <StyledNewOptionBadge data-test="new-option-badge">
+                  {t('New')}
+                </StyledNewOptionBadge>
+              </>
+            ) : (
+              option.label || option.value
+            )
+          }
           placeholder={placeholder}
           showSearch={shouldShowSearch}
           tokenSeparators={quoteAwareTokenSeparators}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index 344856e90e43..ed40042ef4b1 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -35,7 +35,6 @@ import { t } from '@apache-superset/core/translation';
 import { ConfigProvider } from 'antd';
 import { ensureIsArray, formatNumber, usePrevious } from '@superset-ui/core';
 import { Constants } from '@superset-ui/core/components';
-import { Space } from '../Space';
 import {
   BaseOptionType,
   DefaultOptionType,
@@ -520,9 +519,10 @@ const Select = forwardRef(
         setSelectValue(array);
 
         // removes new option
-        if (option.isNewOption) {
+        if (isNewOption(option)) {
+          const targetVal = getValue(value);
           const updatedOptions = fullSelectOptions.filter(
-            option => getValue(option.value) !== getValue(value),
+            opt => getValue(opt.value) !== targetVal && opt.label !== targetVal,
           );
           setSelectOptions(updatedOptions);
           setVisibleOptions(updatedOptions);
@@ -1063,7 +1063,18 @@ const Select = forwardRef(
             )
           }
           options={visibleOptions}
-          optionRender={option => option.label || option.value}
+          optionRender={option =>
+            isNewOption(option.data) || isNewOption(option) ? (
+              <>
+                {option.label || option.value}
+                <StyledNewOptionBadge data-test="new-option-badge">
+                  {t('New')}
+                </StyledNewOptionBadge>
+              </>
+            ) : (
+              option.label || option.value
+            )
+          }
           oneLine={oneLine}
           popupMatchSelectWidth={oneLine ? dropdownWidth : true}
           builtinPlacements={DROPDOWN_BUILTIN_PLACEMENTS}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
index 0c6f92940132..8cf7981b5b7c 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
@@ -157,3 +157,18 @@ export const StyledBulkActionsContainer = styled(Flex)`
     }
   `}
 `;
+
+export const StyledNewOptionBadge = styled.span`
+  ${({ theme }) => `
+    display: inline-block;
+    padding: 0 ${theme.sizeUnit}px;
+    font-size: ${theme.fontSizeSM - 2}px;
+    line-height: ${theme.sizeUnit * 4}px;
+    color: ${theme.colorTextSecondary};
+    background-color: ${theme.colorFillTertiary};
+    border-radius: ${theme.borderRadiusSM}px;
+    margin-left: ${theme.sizeUnit}px;
+    vertical-align: middle;
+    text-transform: lowercase;
+  `}
+`;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
index 5b1c937bfbef..f6e0bace33c1 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
@@ -29,7 +29,9 @@ export type RawValue = string | number;
 
 export type V = string | number | null | undefined;
 
-export type LabeledValue = AntdLabeledValue;
+export type LabeledValue = AntdLabeledValue & {
+  isNewOption?: boolean;
+};
 
 export type CustomLabeledValue = {
   label?: ReactNode;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
index 0c4e47ff57fe..9a770d43d396 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
@@ -63,8 +63,8 @@ export function getOption(
   checkLabel = false,
 ): V | CustomLabeledValue {
   const optionsArray = ensureIsArray(options);
-  const targetValue = isObject(value) ? value.value : value;
-  const targetLabel = isObject(value) ? value.label : value;
+  const targetValue = (isObject(value) ? value.value : value) as V;
+  const targetLabel = (isObject(value) ? value.label : value) as V;
   for (const x of optionsArray) {
     if (
       isEqual(x, targetValue, 'value') ||
@@ -101,8 +101,12 @@ export function hasOption(
  * */
 export const propertyComparator =
   (property: string) => (a: AntdLabeledValue, b: AntdLabeledValue) => {
-    const propertyA = a[property as keyof CustomLabeledValue];
-    const propertyB = b[property as keyof CustomLabeledValue];
+    const propertyA = (a as CustomLabeledValue)[
+      property as keyof CustomLabeledValue
+    ];
+    const propertyB = (b as CustomLabeledValue)[
+      property as keyof CustomLabeledValue
+    ];
     if (typeof propertyA === 'string' && typeof propertyB === 'string') {
       return propertyA.localeCompare(propertyB);
     }
@@ -258,11 +262,10 @@ export const handleFilterOptionHelper = (
     const searchValue = stripSurroundingQuotes(search).toLowerCase();
     if (optionFilterProps?.length) {
       return optionFilterProps.some(prop => {
-        const optionProp = option?.[prop as keyof CustomLabeledValue]
-          ? String(option[prop as keyof CustomLabeledValue])
-              .trim()
-              .toLowerCase()
-          : '';
+        const propVal = (option as CustomLabeledValue)?.[
+          prop as keyof CustomLabeledValue
+        ];
+        const optionProp = propVal ? String(propVal).trim().toLowerCase() : '';
         return optionProp.includes(searchValue);
       });
     }

From 45c519bb920bec64a11ac35abf228f0e42b7bac7 Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Tue, 13 Oct 2026 15:14:38 +0200
Subject: [PATCH 08/12] fix(select): type missingValues as RawValue and await
 debounced search in AsyncSelect test (#44894)

---
 .../src/components/Select/AsyncSelect.test.tsx            | 1 +
 .../superset-ui-core/src/components/Select/Select.tsx     | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
index 1de4a6a4efd1..3b530c56cd51 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
@@ -1369,6 +1369,7 @@ test('drops optimistic new option when paginated mergeData contains matching lab
 
   // Type a term that will match next page's label
   await type('Created Later');
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(2));
   const options = await findAllSelectOptions();
   expect(
     Array.from(options).some(opt => opt.textContent?.includes('Created Later')),
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index ed40042ef4b1..174d9c164d63 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -287,9 +287,11 @@ const Select = forwardRef(
         .filter(
           opt => !hasOption(getValue(opt), groupedOptions || selectOptions),
         )
-        .map(opt =>
-          isLabeledValue(opt) ? opt : { value: opt, label: String(opt) },
-        );
+        .map(opt => {
+          const val = getValue(opt) as RawValue;
+          const label = isLabeledValue(opt) ? opt.label : String(val);
+          return { value: val, label };
+        });
       const result =
         missingValues.length > 0
           ? missingValues.concat(selectOptions)

From d03c470897a9b4f0312982b003db3c34e514cfd5 Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Tue, 13 Oct 2026 20:48:05 +0200
Subject: [PATCH 09/12] fix(select): resolve review comments for typing and
 equality invariant (#44894)

1. Harmonize SelectValue union with LabeledValue in types.ts to preserve consumer contracts and resolve TS2322.

2. Type story args with Omit<AsyncSelectProps, 'ref'> in AsyncSelect.stories.tsx to prevent ref spread mismatch.

3. Refine isEqual equality invariant in utils.tsx to distinguish empty string and whitespace while preserving whitespace trimming and numeric zero equality.

4. Add regression unit tests in utils.test.ts for whitespace boundary conditions and numeric zero.
---
 .../components/Select/AsyncSelect.stories.tsx |  2 +-
 .../src/components/Select/types.ts            |  8 ++-
 .../src/components/Select/utils.test.ts       | 67 +++++++++++++++++++
 .../src/components/Select/utils.tsx           | 22 +++++-
 4 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
index 942b6c0d8bd7..9c80d9d7cc7f 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.stories.tsx
@@ -350,7 +350,7 @@ const createMockUserFetcher =
  * with a [new] badge and are automatically dropped if the server returns a matching
  * option upon search completion.
  */
-export const WithAllowNewOptions = (args: AsyncSelectProps) => (
+export const WithAllowNewOptions = (args: Omit<AsyncSelectProps, 'ref'>) => (
   <div style={{ width: DEFAULT_WIDTH }}>
     <AsyncSelect
       {...args}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
index f6e0bace33c1..4214e681a705 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/types.ts
@@ -42,7 +42,13 @@ export type CustomLabeledValue = {
 
 export type AntdProps = AntdSelectProps<AntdSelectValue>;
 
-export type SelectValue = AntdSelectValue | null;
+export type SelectValue =
+  | RawValue
+  | RawValue[]
+  | LabeledValue
+  | LabeledValue[]
+  | null
+  | undefined;
 
 export type { RefSelectProps };
 
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
index 3d4c932b9d1a..cd648f76b63a 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
@@ -184,3 +184,70 @@ test('propertyComparator sorts mixed bigint and number properties numerically',
     bigHundred,
   ]);
 });
+
+test('isEqual handles matching numbers and strings', () => {
+  expect(isEqual(1, 1, 'value')).toBe(true);
+  expect(isEqual(1, '1', 'value')).toBe(true);
+  expect(isEqual({ value: 1 }, 1, 'value')).toBe(true);
+  expect(isEqual({ value: 1 }, '1', 'value')).toBe(true);
+  expect(isEqual(' test ', 'test', 'value')).toBe(true);
+  expect(isEqual({ value: 'abc' }, { value: 'abc' }, 'value')).toBe(true);
+  expect(isEqual({ value: 'abc' }, { value: 'def' }, 'value')).toBe(false);
+});
+
+test('isEqual distinguishes empty strings and whitespace while preserving deduplication', () => {
+  expect(isEqual('', ' ', 'value')).toBe(false);
+  expect(isEqual(' ', '', 'value')).toBe(false);
+  expect(isEqual('', '   ', 'value')).toBe(false);
+  expect(isEqual(' ', '   ', 'value')).toBe(false);
+  expect(isEqual('', '', 'value')).toBe(true);
+  expect(isEqual(' ', ' ', 'value')).toBe(true);
+  expect(isEqual(' test ', 'test', 'value')).toBe(true);
+  expect(isEqual(' Sales ', 'Sales', 'value')).toBe(true);
+  expect(isEqual('Sales', ' Sales ', 'value')).toBe(true);
+  expect(isEqual('Sales', 'sales', 'value')).toBe(false);
+  expect(isEqual(0, '', 'value')).toBe(false);
+  expect(isEqual(0, ' ', 'value')).toBe(false);
+  expect(isEqual(0, '0', 'value')).toBe(true);
+  expect(isEqual(1, '1', 'value')).toBe(true);
+  expect(isEqual(null, undefined, 'value')).toBe(true);
+  expect(isEqual(null, '', 'value')).toBe(false);
+  expect(isEqual({ value: 0 }, '', 'value')).toBe(false);
+  expect(isEqual({ value: 0 }, '0', 'value')).toBe(true);
+  expect(isEqual({ label: ' Sales ' }, 'Sales', 'label')).toBe(true);
+});
+
+test('getOption and hasOption locate options by value or label', () => {
+  const options = [
+    { label: 'Option 1', value: 1 },
+    { label: 'Option 2', value: 2 },
+    { label: 'New Option', value: 'New Option', isNewOption: true },
+  ];
+  expect(hasOption(1, options)).toBe(true);
+  expect(hasOption(99, options)).toBe(false);
+  expect(hasOption('Option 2', options, true)).toBe(true);
+  expect(hasOption('Option 2', options, false)).toBe(false);
+  expect(getOption(2, options)).toEqual({ label: 'Option 2', value: 2 });
+  expect(getOption('Option 1', options, true)).toEqual({
+    label: 'Option 1',
+    value: 1,
+  });
+  expect(getOption({ value: 2 }, options)).toEqual({
+    label: 'Option 2',
+    value: 2,
+  });
+  expect(getOption({ label: 'Option 1' }, options, true)).toEqual({
+    label: 'Option 1',
+    value: 1,
+  });
+});
+
+test('isNewOption detects temporary new option flag safely', () => {
+  expect(isNewOption({ label: 'test', value: 'test', isNewOption: true })).toBe(
+    true,
+  );
+  expect(isNewOption({ label: 'test', value: 'test' })).toBe(false);
+  expect(isNewOption(null)).toBe(false);
+  expect(isNewOption('string')).toBe(false);
+  expect(isNewOption(123)).toBe(false);
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
index 9a770d43d396..99e010a61731 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
@@ -51,10 +51,30 @@ export function isEqual(
     isObject(a) && key in a ? a[key as keyof CustomLabeledValue] : a;
   const actualB =
     isObject(b) && key in b ? b[key as keyof CustomLabeledValue] : b;
+
+  if (
+    (typeof actualA === 'number' &&
+      typeof actualB === 'string' &&
+      actualB.trim() === '') ||
+    (typeof actualB === 'number' &&
+      typeof actualA === 'string' &&
+      actualA.trim() === '')
+  ) {
+    return false;
+  }
+
   // When comparing the values we use the equality
   // operator to automatically convert different types
   // eslint-disable-next-line eqeqeq
-  return actualA == actualB;
+  if (actualA == actualB) {
+    return true;
+  }
+  if (typeof actualA === 'string' && typeof actualB === 'string') {
+    const trimmedA = actualA.trim();
+    const trimmedB = actualB.trim();
+    return trimmedA.length > 0 && trimmedA === trimmedB;
+  }
+  return false;
 }
 
 export function getOption(

From 39555a8e4b80c3323c016d9bb199bdfd236616b6 Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Wed, 28 Oct 2026 17:03:01 +0100
Subject: [PATCH 10/12] fix(select): define and import isNewOption helper
 across Select components (#44894)

- Export isNewOption type guard helper in utils.tsx
- Import isNewOption in Select.tsx, AsyncSelect.tsx, and utils.test.ts
- Resolves ReferenceError in SelectFilterPlugin and unit tests

Signed-off-by: Francesco Castaldi <info@francescocastaldi.it>
---
 .../superset-ui-core/src/components/Select/AsyncSelect.tsx  | 1 +
 .../superset-ui-core/src/components/Select/Select.tsx       | 1 +
 .../superset-ui-core/src/components/Select/utils.test.ts    | 1 +
 .../superset-ui-core/src/components/Select/utils.tsx        | 6 ++++++
 4 files changed, 9 insertions(+)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
index 32e3005759d8..04db12be0aac 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
@@ -52,6 +52,7 @@ import {
   getValue,
   hasOption,
   isLabeledValue,
+  isNewOption,
   sortSelectedFirstHelper,
   sortComparatorWithSearchHelper,
   sortComparatorForNoSearchHelper,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index 174d9c164d63..4be0b59539db 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -50,6 +50,7 @@ import {
   handleFilterOptionHelper,
   hasOption,
   isLabeledValue,
+  isNewOption,
   isObject,
   makeQuoteAwareTokenizer,
   mapOptions,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
index cd648f76b63a..b73c772f8997 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
@@ -22,6 +22,7 @@ import {
   stripSurroundingQuotes,
   makeQuoteAwareTokenizer,
   propertyComparator,
+  isNewOption,
 } from './utils';
 
 test('stripSurroundingQuotes removes matching surrounding double quotes', () => {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
index 99e010a61731..3c173785cb92 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
@@ -36,6 +36,12 @@ export function isLabeledValue(value: unknown): value is AntdLabeledValue {
   return isObject(value) && 'value' in value && 'label' in value;
 }
 
+export function isNewOption(
+  option: unknown,
+): option is { isNewOption: boolean } {
+  return isObject(option) && Boolean((option as { isNewOption?: boolean }).isNewOption);
+}
+
 export function getValue(
   option: string | number | AntdLabeledValue | null | undefined,
 ) {

From 5f33ef3d68af0351155b9a62f4748c904e9b82bd Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Thu, 29 Oct 2026 23:06:32 +0100
Subject: [PATCH 11/12] fix(select): address review feedback on imports,
 typing, and tests (#44894)

Signed-off-by: Francesco Castaldi <info@francescocastaldi.it>
---
 .../components/Select/AsyncSelect.test.tsx    | 58 ++++++++++++++++---
 .../src/components/Select/AsyncSelect.tsx     | 29 +++++++---
 .../src/components/Select/Select.tsx          |  3 +-
 .../src/components/Select/utils.test.ts       |  3 +
 .../src/components/Select/utils.tsx           | 10 ++--
 5 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
index 3b530c56cd51..5778d85588fd 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
@@ -1361,7 +1361,7 @@ test('drops optimistic new option when paginated mergeData contains matching lab
     return { data: nextPageData, totalCount: 2 };
   });
 
-  const { rerender } = render(
+  render(
     <AsyncSelect {...defaultProps} options={loadOptions} allowNewOptions />,
   );
   await open();
@@ -1370,16 +1370,60 @@ test('drops optimistic new option when paginated mergeData contains matching lab
   // Type a term that will match next page's label
   await type('Created Later');
   await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(2));
-  const options = await findAllSelectOptions();
+
+  // Optimistic option is present with "new" badge before pagination
+  const optionsBefore = await findAllSelectOptions();
   expect(
-    Array.from(options).some(opt => opt.textContent?.includes('Created Later')),
+    Array.from(optionsBefore).some(opt =>
+      opt.textContent?.includes('Created Later'),
+    ),
   ).toBe(true);
+  expect(screen.getByTestId('new-option-badge')).toBeInTheDocument();
 
-  // When next page loads and mergeData fires, duplicate optimistic option is dropped
-  rerender(
-    <AsyncSelect {...defaultProps} options={loadOptions} allowNewOptions />,
+  // Wait for loading to finish so handlePagination's `!isLoading` gate is open
+  await waitFor(() =>
+    expect(document.querySelector('.ant-select-suffix .ant-spin')).toBeNull(),
   );
-  expect(loadOptions).toBeDefined();
+
+  // Trigger pagination by dispatching a scroll event on the virtual-list container
+  const holder = document.querySelector(
+    '.ant-select-dropdown-list-holder',
+  ) as HTMLElement | null;
+  if (!holder) throw new Error('virtual-list holder not rendered');
+  Object.defineProperty(holder, 'scrollHeight', {
+    configurable: true,
+    get: () => 1000,
+  });
+  Object.defineProperty(holder, 'offsetHeight', {
+    configurable: true,
+    get: () => 200,
+  });
+  Object.defineProperty(holder, 'clientHeight', {
+    configurable: true,
+    get: () => 200,
+  });
+  Object.defineProperty(holder, 'scrollTop', {
+    configurable: true,
+    get: () => 900,
+    set: () => {},
+  });
+  fireEvent.scroll(holder);
+
+  await waitFor(() =>
+    expect(loadOptions).toHaveBeenCalledWith(
+      'Created Later',
+      1,
+      expect.anything(),
+    ),
+  );
+
+  // After next page loads and mergeData fires, duplicate optimistic
+  // option is dropped and server option (without "new" badge) remains.
+  await waitFor(async () => {
+    const matchingOptions = screen.getAllByText('Created Later');
+    expect(matchingOptions).toHaveLength(1);
+    expect(screen.queryByTestId('new-option-badge')).not.toBeInTheDocument();
+  });
 });
 
 test('restores base options when search is cleared', async () => {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
index 04db12be0aac..69865567437f 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
@@ -82,6 +82,7 @@ import {
   StyledError,
   StyledErrorMessage,
   StyledHeader,
+  StyledNewOptionBadge,
   StyledSelect,
   StyledStopOutlined,
 } from './styles';
@@ -392,12 +393,26 @@ const AsyncSelect = forwardRef(
     const isRedundantNewOption = (
       opt: DefaultOptionType | AntdLabeledValue,
       incomingData: SelectOptionsType,
-    ) =>
-      isNewOption(opt) &&
-      ((typeof opt.label === 'string' || typeof opt.label === 'number'
-        ? hasOption(opt.label, incomingData, true)
-        : false) ||
-        hasOption(opt.value as RawValue | undefined, incomingData, true));
+    ) => {
+      if (!isNewOption(opt)) {
+        return false;
+      }
+      const label =
+        typeof opt.label === 'string' || typeof opt.label === 'number'
+          ? opt.label
+          : undefined;
+      return (
+        label !== undefined &&
+        incomingData.some(item => {
+          if (isObject(item) && Array.isArray((item as any).options)) {
+            return (item as any).options.some((child: any) =>
+              isEqual(child, label, 'label'),
+            );
+          }
+          return isEqual(item, label, 'label');
+        })
+      );
+    };
 
     const mergeData = useCallback(
       (data: SelectOptionsType) => {
@@ -630,7 +645,7 @@ const AsyncSelect = forwardRef(
                 isNewOption: true,
               };
             const cleanSelectOptions = fullSelectOptions.filter(
-              opt => !opt.isNewOption || hasOption(opt.value, selectValue),
+              opt => !isNewOption(opt) || hasOption(opt.value, selectValue),
             );
             const newOptions = newOption
               ? [newOption, ...cleanSelectOptions]
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index 4be0b59539db..24d458070343 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -67,6 +67,7 @@ import {
   StyledCheckOutlined,
   StyledContainer,
   StyledHeader,
+  StyledNewOptionBadge,
   StyledSelect,
   StyledStopOutlined,
 } from './styles';
@@ -590,7 +591,7 @@ const Select = forwardRef(
               isNewOption: true,
             };
             const cleanSelectOptions = ensureIsArray(fullSelectOptions).filter(
-              opt => !opt.isNewOption || hasOption(opt.value, selectValue),
+              opt => !isNewOption(opt) || hasOption(opt.value, selectValue),
             );
             updatedOptions = newOption
               ? [newOption, ...cleanSelectOptions]
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
index b73c772f8997..11826b260b19 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
@@ -23,6 +23,9 @@ import {
   makeQuoteAwareTokenizer,
   propertyComparator,
   isNewOption,
+  isEqual,
+  getOption,
+  hasOption,
 } from './utils';
 
 test('stripSurroundingQuotes removes matching surrounding double quotes', () => {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
index 3c173785cb92..7df140dc8a20 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
@@ -36,10 +36,8 @@ export function isLabeledValue(value: unknown): value is AntdLabeledValue {
   return isObject(value) && 'value' in value && 'label' in value;
 }
 
-export function isNewOption(
-  option: unknown,
-): option is { isNewOption: boolean } {
-  return isObject(option) && Boolean((option as { isNewOption?: boolean }).isNewOption);
+export function isNewOption(option: unknown): boolean {
+  return isObject(option) && Boolean(option.isNewOption);
 }
 
 export function getValue(
@@ -84,7 +82,7 @@ export function isEqual(
 }
 
 export function getOption(
-  value: V,
+  value: V | CustomLabeledValue,
   options?: V | CustomLabeledValue | (V | CustomLabeledValue)[],
   checkLabel = false,
 ): V | CustomLabeledValue {
@@ -114,7 +112,7 @@ export function getOption(
 }
 
 export function hasOption(
-  value: V,
+  value: V | CustomLabeledValue,
   options?: V | CustomLabeledValue | (V | CustomLabeledValue)[],
   checkLabel = false,
 ): boolean {

From af604c560a27427e466e8be8d8e21509e29c6435 Mon Sep 17 00:00:00 2001
From: Francesco Castaldi <info@francescocastaldi.it>
Date: Fri, 30 Oct 2026 10:20:18 +0100
Subject: [PATCH 12/12] fix(select): address review feedback on utilsIsEqual,
 pagination, prop preservation, and trim key (#44894)

Signed-off-by: Francesco Castaldi <info@francescocastaldi.it>
---
 .../src/components/Select/AsyncSelect.test.tsx       |  4 ++--
 .../src/components/Select/AsyncSelect.tsx            |  4 ++--
 .../src/components/Select/Select.tsx                 |  8 +++-----
 .../src/components/Select/utils.test.ts              | 12 ++++++++----
 .../superset-ui-core/src/components/Select/utils.tsx |  6 +++++-
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
index 5778d85588fd..d30d0faa0825 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx
@@ -1356,9 +1356,9 @@ test('drops optimistic new option when paginated mergeData contains matching lab
   const nextPageData = [{ label: 'Created Later', value: 99 }];
   const loadOptions = jest.fn(async (_search: string, page: number) => {
     if (page === 0) {
-      return { data: initialData, totalCount: 2 };
+      return { data: initialData, totalCount: 20 };
     }
-    return { data: nextPageData, totalCount: 2 };
+    return { data: nextPageData, totalCount: 20 };
   });
 
   render(
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
index 69865567437f..2ae8843fe49b 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx
@@ -406,10 +406,10 @@ const AsyncSelect = forwardRef(
         incomingData.some(item => {
           if (isObject(item) && Array.isArray((item as any).options)) {
             return (item as any).options.some((child: any) =>
-              isEqual(child, label, 'label'),
+              utilsIsEqual(child, label, 'label'),
             );
           }
-          return isEqual(item, label, 'label');
+          return utilsIsEqual(item, label, 'label');
         })
       );
     };
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index 24d458070343..187f82cb476e 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -289,11 +289,9 @@ const Select = forwardRef(
         .filter(
           opt => !hasOption(getValue(opt), groupedOptions || selectOptions),
         )
-        .map(opt => {
-          const val = getValue(opt) as RawValue;
-          const label = isLabeledValue(opt) ? opt.label : String(val);
-          return { value: val, label };
-        });
+        .map(opt =>
+          isLabeledValue(opt) ? opt : { value: opt, label: String(opt) },
+        );
       const result =
         missingValues.length > 0
           ? missingValues.concat(selectOptions)
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
index 11826b260b19..622d54fa5367 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.test.ts
@@ -194,7 +194,8 @@ test('isEqual handles matching numbers and strings', () => {
   expect(isEqual(1, '1', 'value')).toBe(true);
   expect(isEqual({ value: 1 }, 1, 'value')).toBe(true);
   expect(isEqual({ value: 1 }, '1', 'value')).toBe(true);
-  expect(isEqual(' test ', 'test', 'value')).toBe(true);
+  expect(isEqual(' test ', 'test', 'value')).toBe(false);
+  expect(isEqual(' test ', 'test', 'label')).toBe(true);
   expect(isEqual({ value: 'abc' }, { value: 'abc' }, 'value')).toBe(true);
   expect(isEqual({ value: 'abc' }, { value: 'def' }, 'value')).toBe(false);
 });
@@ -206,9 +207,12 @@ test('isEqual distinguishes empty strings and whitespace while preserving dedupl
   expect(isEqual(' ', '   ', 'value')).toBe(false);
   expect(isEqual('', '', 'value')).toBe(true);
   expect(isEqual(' ', ' ', 'value')).toBe(true);
-  expect(isEqual(' test ', 'test', 'value')).toBe(true);
-  expect(isEqual(' Sales ', 'Sales', 'value')).toBe(true);
-  expect(isEqual('Sales', ' Sales ', 'value')).toBe(true);
+  expect(isEqual(' test ', 'test', 'value')).toBe(false);
+  expect(isEqual(' test ', 'test', 'label')).toBe(true);
+  expect(isEqual(' Sales ', 'Sales', 'value')).toBe(false);
+  expect(isEqual(' Sales ', 'Sales', 'label')).toBe(true);
+  expect(isEqual('Sales', ' Sales ', 'value')).toBe(false);
+  expect(isEqual('Sales', ' Sales ', 'label')).toBe(true);
   expect(isEqual('Sales', 'sales', 'value')).toBe(false);
   expect(isEqual(0, '', 'value')).toBe(false);
   expect(isEqual(0, ' ', 'value')).toBe(false);
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
index 7df140dc8a20..574b9511d52f 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx
@@ -73,7 +73,11 @@ export function isEqual(
   if (actualA == actualB) {
     return true;
   }
-  if (typeof actualA === 'string' && typeof actualB === 'string') {
+  if (
+    key === 'label' &&
+    typeof actualA === 'string' &&
+    typeof actualB === 'string'
+  ) {
     const trimmedA = actualA.trim();
     const trimmedB = actualB.trim();
     return trimmedA.length > 0 && trimmedA === trimmedB;