Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Environment kv editor flash when user input the first time [INS-4709] #8182

Merged
merged 3 commits into from
Nov 21, 2024
Merged

Fix: Environment kv editor flash when user input the first time [INS-4709] #8182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17e6731
1.fix issues
cwangsmv Nov 19, 2024
8f3d526
1.fix comments
cwangsmv Nov 19, 2024
17ae67c
fix key value editor focus issue for RequestParameters editor
gatzjames Nov 20, 2024
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
10 changes: 7 additions & 3 deletions ...ages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef, useState } from 'react';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { Button, type ButtonProps, DropIndicator, ListBox, ListBoxItem, Menu, MenuItem, MenuTrigger, Popover, Toolbar, useDragAndDrop } from 'react-aria-components';

import { generateId } from '../../../../common/misc';
Expand Down Expand Up @@ -39,7 +39,12 @@ const ItemButton = (props: ButtonProps & { tabIndex?: number }) => {
};

export const EnvironmentKVEditor = ({ data, onChange }: EditorProps) => {
const kvPairs: EnvironmentKvPairData[] = data.length > 0 ? [...data] : [createNewPair()];
const kvPairs: EnvironmentKvPairData[] = useMemo(
() => data.length > 0 ? [...data] : [createNewPair()],
// Ensure same array data will not generate different kvPairs to avoid flash issue
// eslint-disable-next-line react-hooks/exhaustive-deps
[JSON.stringify(data)]
);
const codeModalRef = useRef<CodePromptModalHandle>(null);
const [kvPairError, setKvPairError] = useState<{ id: string; error: string }[]>([]);

Expand Down Expand Up @@ -271,7 +276,6 @@ export const EnvironmentKVEditor = ({ data, onChange }: EditorProps) => {
<Icon icon={enabled ? 'check-square' : 'square'} />
</ItemButton>
<PromptButton
disabled={kvPairs.length <= 1}
className="flex items-center disabled:opacity-50 justify-center h-7 aspect-square aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all text-sm"
fullWidth
confirmMessage=''
Expand Down
3 changes: 0 additions & 3 deletions packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,8 @@ export const RequestParametersEditor: FC<Props> = ({
);
}

const pairsIds = activeRequest.parameters.map((param, index) => param.id || index).join(',');

return (
<KeyValueEditor
key={pairsIds}
allowMultiline
namePlaceholder="name"
valuePlaceholder="value"
Expand Down
17 changes: 9 additions & 8 deletions packages/insomnia/src/ui/components/key-value-editor/key-value-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { type FC, Fragment, useCallback } from 'react';
import React, { type FC, Fragment, useCallback, useMemo } from 'react';
import { Button, DropIndicator, ListBox, ListBoxItem, Menu, MenuItem, MenuTrigger, Popover, ToggleButton, Toolbar, useDragAndDrop } from 'react-aria-components';

import { describeByteSize, generateId } from '../../../common/misc';
Expand Down Expand Up @@ -63,17 +63,19 @@ export const KeyValueEditor: FC<Props> = ({
}) => {
const [showDescription, setShowDescription] = React.useState(false);
const { enabled: nunjucksEnabled } = useNunjucksEnabled();
let pairsListItems = pairs.length > 0 ? pairs.map(pair => ({ ...pair, id: pair.id || generateId('pair') })) : [createEmptyPair()];
let pairsListItems = useMemo(
() => pairs.length > 0 ? pairs.map(pair => ({ ...pair, id: pair.id || generateId('pair') })) : [createEmptyPair()],
// Ensure same array data will not generate different kvPairs to avoid flash issue
// eslint-disable-next-line react-hooks/exhaustive-deps
[JSON.stringify(pairs)]
);
const initialReadOnlyItems = readOnlyPairs?.map(pair => ({ ...pair, id: pair.id || generateId('pair') })) || [];

const upsertPair = useCallback(function upsertPair(pairsListItems: Pair[], pair: Pair) {
if (pairsListItems.find(item => item.id === pair.id)) {
pairsListItems = pairsListItems.map(item => (item.id === pair.id ? pair : item));
onChange(pairsListItems);
onChange(pairsListItems.map(item => (item.id === pair.id ? pair : item)));
} else {
const id = pair.id === 'pair-empty' ? generateId('pair') : pair.id;
pairsListItems = pairsListItems.concat({ ...pair, id });
onChange(pairsListItems);
onChange([...pairsListItems, pair]);
}
}, [onChange]);

Expand Down Expand Up @@ -305,7 +307,6 @@ export const KeyValueEditor: FC<Props> = ({
<ListBox
aria-label='Key-value pairs'
selectionMode='none'
// dependencies={[showDescription, nunjucksEnabled]}
className="flex pt-1 flex-col w-full overflow-y-auto flex-1 relative"
dragAndDropHooks={dragAndDropHooks}
dependencies={[upsertPair, showDescription, nunjucksEnabled]}
Expand Down
Loading