From 77d9e99867360cfa054f7e52e639afdfe2bb5ede Mon Sep 17 00:00:00 2001
From: Shreyas2004wagh <shreyaswagh2004@gmail.com>
Date: Mon, 23 Mar 2026 19:57:26 +0530
Subject: [PATCH] fix(ui-kit): preserve falsy initial and state values

---
 packages/ui-kit/src/hooks/useUiKitState.js    |  4 +-
 .../ui-kit/src/hooks/useUiKitState.test.js    | 55 +++++++++++++++++++
 packages/ui-kit/src/utils/getInitialValue.js  | 18 +++---
 .../ui-kit/src/utils/getInitialValue.test.js  | 36 ++++++++++++
 4 files changed, 104 insertions(+), 9 deletions(-)
 create mode 100644 packages/ui-kit/src/hooks/useUiKitState.test.js
 create mode 100644 packages/ui-kit/src/utils/getInitialValue.test.js

diff --git a/packages/ui-kit/src/hooks/useUiKitState.js b/packages/ui-kit/src/hooks/useUiKitState.js
index 44c18d83d8..1cd8b045c8 100644
--- a/packages/ui-kit/src/hooks/useUiKitState.js
+++ b/packages/ui-kit/src/hooks/useUiKitState.js
@@ -6,8 +6,8 @@ import * as UiKit from '@rocket.chat/ui-kit';
 import { UiKitContext } from '../contexts/UiKitContext';
 import { getInitialValue } from '../utils/getInitialValue';
 
-const getElementValueFromState = (actionId, values, initialValue) =>
-  (values && (values[actionId]?.value || initialValue)) ?? initialValue;
+export const getElementValueFromState = (actionId, values, initialValue) =>
+  values?.[actionId]?.value ?? initialValue;
 
 export const useUiKitState = (element, context) => {
   const { blockId, actionId, appId, dispatchActionConfig } = element;
diff --git a/packages/ui-kit/src/hooks/useUiKitState.test.js b/packages/ui-kit/src/hooks/useUiKitState.test.js
new file mode 100644
index 0000000000..196c1d7506
--- /dev/null
+++ b/packages/ui-kit/src/hooks/useUiKitState.test.js
@@ -0,0 +1,55 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { UiKitContext } from '../contexts/UiKitContext';
+import { useUiKitState } from './useUiKitState';
+
+const HookProbe = ({ element }) => {
+  const [{ value }] = useUiKitState(element);
+
+  return <span data-testid="value">{JSON.stringify(value)}</span>;
+};
+
+const renderProbe = (element, values) =>
+  render(
+    <UiKitContext.Provider value={{ values }}>
+      <HookProbe element={element} />
+    </UiKitContext.Provider>
+  );
+
+describe('useUiKitState', () => {
+  test('preserves zero values from context state', () => {
+    renderProbe(
+      {
+        type: 'linear_scale',
+        blockId: 'block-id',
+        actionId: 'score',
+        initialValue: 5,
+      },
+      {
+        score: {
+          value: 0,
+        },
+      }
+    );
+
+    expect(screen.getByTestId('value').textContent).toBe('0');
+  });
+
+  test('preserves empty string values from context state', () => {
+    renderProbe(
+      {
+        type: 'plain_text_input',
+        blockId: 'block-id',
+        actionId: 'message',
+        initialValue: 'prefilled',
+      },
+      {
+        message: {
+          value: '',
+        },
+      }
+    );
+
+    expect(screen.getByTestId('value').textContent).toBe('""');
+  });
+});
diff --git a/packages/ui-kit/src/utils/getInitialValue.js b/packages/ui-kit/src/utils/getInitialValue.js
index 15de56f997..8bac71397a 100644
--- a/packages/ui-kit/src/utils/getInitialValue.js
+++ b/packages/ui-kit/src/utils/getInitialValue.js
@@ -11,10 +11,14 @@ const hasInitialOption = (element) => 'initialOption' in element;
 const hasInitialOptions = (element) => 'initialOptions' in element;
 
 export const getInitialValue = (element) =>
-  (hasInitialValue(element) && element.initialValue) ||
-  (hasInitialTime(element) && element.initialTime) ||
-  (hasInitialDate(element) && element.initialDate) ||
-  (hasInitialOption(element) && element.initialOption.value) ||
-  (hasInitialOptions(element) &&
-    element.initialOptions.map((option) => option.value)) ||
-  undefined;
+  hasInitialValue(element) && element.initialValue !== undefined
+    ? element.initialValue
+    : hasInitialTime(element) && element.initialTime !== undefined
+    ? element.initialTime
+    : hasInitialDate(element) && element.initialDate !== undefined
+    ? element.initialDate
+    : hasInitialOption(element) && element.initialOption?.value !== undefined
+    ? element.initialOption.value
+    : hasInitialOptions(element)
+    ? element.initialOptions.map((option) => option.value)
+    : undefined;
diff --git a/packages/ui-kit/src/utils/getInitialValue.test.js b/packages/ui-kit/src/utils/getInitialValue.test.js
new file mode 100644
index 0000000000..af54adf7e9
--- /dev/null
+++ b/packages/ui-kit/src/utils/getInitialValue.test.js
@@ -0,0 +1,36 @@
+import { getInitialValue } from './getInitialValue';
+
+describe('getInitialValue', () => {
+  test('preserves empty string initial values', () => {
+    expect(
+      getInitialValue({
+        type: 'plain_text_input',
+        actionId: 'message',
+        initialValue: '',
+      })
+    ).toBe('');
+  });
+
+  test('preserves zero-valued initial values', () => {
+    expect(
+      getInitialValue({
+        type: 'linear_scale',
+        actionId: 'score',
+        initialValue: 0,
+      })
+    ).toBe(0);
+  });
+
+  test('preserves empty string option values', () => {
+    expect(
+      getInitialValue({
+        type: 'static_select',
+        actionId: 'status',
+        initialOption: {
+          text: { type: 'plain_text', text: 'None' },
+          value: '',
+        },
+      })
+    ).toBe('');
+  });
+});