Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/ui-kit/src/hooks/useUiKitState.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
55 changes: 55 additions & 0 deletions packages/ui-kit/src/hooks/useUiKitState.test.js
Original file line number Diff line number Diff line change
@@ -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('""');
});
});
18 changes: 11 additions & 7 deletions packages/ui-kit/src/utils/getInitialValue.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
36 changes: 36 additions & 0 deletions packages/ui-kit/src/utils/getInitialValue.test.js
Original file line number Diff line number Diff line change
@@ -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('');
});
});