Skip to content

fix category and tag list gets deselected when editing list item name #67981

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

Merged
rafecolton merged 6 commits into from
Aug 13, 2025
Merged

fix category and tag list gets deselected when editing list item name #67981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bd94f9
fix category and tag list gets deselected when editing list item name
huult Aug 6, 2025
f8a6b55
Merge remote-tracking branch 'upstream/main' into 67608-category-tag-…
huult Aug 6, 2025
900112e
fix tag list diselected when editing name
huult Aug 6, 2025
e041033
Merge remote-tracking branch 'upstream/main' into 67608-category-tag-…
huult Aug 6, 2025
d28dedf
Merge remote-tracking branch 'upstream/main' into 67608-category-tag-…
huult Aug 7, 2025
1e762d0
Merge remote-tracking branch 'upstream/main' into 67608-category-tag-…
huult Aug 12, 2025
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
35 changes: 30 additions & 5 deletions src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import TextLink from '@components/TextLink';
import useAutoTurnSelectionModeOffWhenHasNoActiveOption from '@hooks/useAutoTurnSelectionModeOffWhenHasNoActiveOption';
import useCleanupSelectedOptions from '@hooks/useCleanupSelectedOptions';
import useEnvironment from '@hooks/useEnvironment';
import useFilteredSelection from '@hooks/useFilteredSelection';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
Expand All @@ -52,7 +51,6 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import SCREENS from '@src/SCREENS';
import type {PolicyCategory} from '@src/types/onyx';
import type DeepValueOf from '@src/types/utils/DeepValueOf';

type PolicyOption = ListItem & {
Expand Down Expand Up @@ -90,9 +88,8 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
const isConnectionVerified = connectedIntegration && !isConnectionUnverified(policy, connectedIntegration);
const currentConnectionName = getCurrentConnectionName(policy);
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_ROOT;
const filterCategories = useCallback((category: PolicyCategory | undefined) => !!category && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, []);

const [selectedCategories, setSelectedCategories] = useFilteredSelection(policyCategories, filterCategories);
const [selectedCategories, setSelectedCategories] = useState<string[]>([]);
const canSelectMultiple = isSmallScreenWidth ? isMobileSelectionModeEnabled : true;

const fetchCategories = useCallback(() => {
Expand All @@ -107,9 +104,37 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

const cleanupSelectedOption = useCallback(() => setSelectedCategories([]), [setSelectedCategories]);
const cleanupSelectedOption = useCallback(() => setSelectedCategories([]), []);
useCleanupSelectedOptions(cleanupSelectedOption);

useEffect(() => {
if (selectedCategories.length === 0 || !canSelectMultiple) {
return;
}

setSelectedCategories((prevSelectedCategories) => {
const newSelectedCategories = [];

for (const categoryName of prevSelectedCategories) {
const categoryExists = policyCategories?.[categoryName];
if (!categoryExists) {
const renamedCategory = Object.entries(policyCategories ?? {}).find(([, category]) => category.previousCategoryName === categoryName);
if (renamedCategory) {
newSelectedCategories.push(renamedCategory[0]);
continue;
}
}

if (categoryExists && categoryExists.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
newSelectedCategories.push(categoryName);
}
}

return newSelectedCategories;
});
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [policyCategories]);

useSearchBackPress({
onClearSelection: () => setSelectedCategories([]),
onNavigationCallBack: () => Navigation.goBack(backTo),
Expand Down
55 changes: 50 additions & 5 deletions src/pages/workspace/tags/WorkspaceTagsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useCleanupSelectedOptions from '@hooks/useCleanupSelectedOptions';
import useEnvironment from '@hooks/useEnvironment';
import useFilteredSelection from '@hooks/useFilteredSelection';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
Expand Down Expand Up @@ -122,9 +121,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
return policyTagLists?.at(0)?.tags;
}, [isMultiLevelTags, policyTagLists]);

const filterTags = useCallback((tag?: PolicyTag | PolicyTagList) => !!tag && tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, []);

const [selectedTags, setSelectedTags] = useFilteredSelection(tagsList, filterTags);
const [selectedTags, setSelectedTags] = useState<string[]>([]);

const isTagSelected = useCallback((tag: TagListItem) => selectedTags.includes(tag.value), [selectedTags]);

Expand All @@ -136,7 +133,55 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

const cleanupSelectedOption = useCallback(() => setSelectedTags([]), [setSelectedTags]);
useEffect(() => {
if (selectedTags.length === 0 || !canSelectMultiple) {
return;
}

setSelectedTags((prevSelectedTags) => {
const newSelectedTags = [];

for (const tagName of prevSelectedTags) {
if (isMultiLevelTags) {
const tagListExists = tagsList?.[tagName];
if (!tagListExists) {
const renamedTagList = Object.entries(tagsList ?? {}).find(([, tagList]) => {
const typedTagList = tagList as {previousTagName?: string};
return typedTagList.previousTagName === tagName;
});
if (renamedTagList) {
newSelectedTags.push(renamedTagList[0]);
continue;
}
}

if (tagListExists && tagListExists.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
newSelectedTags.push(tagName);
}
} else {
const tagExists = tagsList?.[tagName];
if (!tagExists) {
const renamedTag = Object.entries(tagsList ?? {}).find(([, tag]) => {
const typedTag = tag as {previousTagName?: string};
return typedTag.previousTagName === tagName;
});
if (renamedTag) {
newSelectedTags.push(renamedTag[0]);
continue;
}
}

if (tagExists && tagExists.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
newSelectedTags.push(tagName);
}
}
}

return newSelectedTags;
});
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [tagsList]);
const cleanupSelectedOption = useCallback(() => setSelectedTags([]), []);
useCleanupSelectedOptions(cleanupSelectedOption);

useSearchBackPress({
Expand Down
Loading