A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: sort assigned tags on top when viewing note tags
Ammar Ahmed60bdc4715d9c
diff --git a/apps/mobile/app/screens/manage-tags/index.tsx b/apps/mobile/app/screens/manage-tags/index.tsxindex cc3a82a7c..4ec85aee2 100644--- a/apps/mobile/app/screens/manage-tags/index.tsx+++ b/apps/mobile/app/screens/manage-tags/index.tsx@@ -92,13 +92,12 @@ const useTagItemSelection = createItemSelectionStore(true);const ManageTags = (props: NavigationProps<"ManageTags">) => {const { colors } = useThemeColors();const ids = props.route.params.ids || [];- const [tags, setTags] = useState<VirtualizedGrouping<Tag>>();+ const [tags, setTags] = useState<Tag[]>();const [query, setQuery] = useState<string>();const inputRef = useRef<TextInput>(null);- const [focus, setFocus] = useState(false);useNavigationFocus(props.navigation, { focusOnInit: true });+ const timerRef = useRef<NodeJS.Timeout>(undefined);const [queryExists, setQueryExists] = useState(false);- const dimensions = useWindowDimensions();const refreshSelection = useCallback(() => {updateInitialSelectionState(ids).then((selection) => {useTagItemSelection.setState({@@ -109,18 +108,43 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {// eslint-disable-next-line react-hooks/exhaustive-deps}, [ids, tags]);+ const sortAndSetTags = useCallback(+ async (items: VirtualizedGrouping<Tag>) => {+ const tags = [];+ const noteTags = [];+ const assignedTags =+ ids.length > 1+ ? []+ : await db.relations+ .to({ type: "note", id: ids[0] }, "tag")+ .resolve();++ for (let i = 0; i < items.placeholders.length; i++) {+ const item = (await items.item(i)).item;+ if (item) {+ if (assignedTags.find((tag) => tag.id === item.id)) {+ noteTags.push(item);+ } else {+ tags.push(item);+ }+ }+ }+ tags.splice(0, 0, ...noteTags);+ setTags(tags);+ },+ []+ );+const refreshTags = useCallback(() => {if (query && query.trim() !== "") {db.lookup.tags(query).sorted(db.settings.getGroupOptions("tags"))- .then((items) => {- setTags(items);- });+ .then(sortAndSetTags);} else {- db.tags.all.sorted(db.settings.getGroupOptions("tags")).then((items) => {- setTags(items);- });+ db.tags.all+ .sorted(db.settings.getGroupOptions("tags"))+ .then(sortAndSetTags);}}, [query]);@@ -241,14 +265,10 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {);const renderTag = useCallback(- ({ index }: { item: boolean; index: number }) => (- <TagItem- tags={tags as VirtualizedGrouping<Tag>}- id={index}- onPress={onPress}- />+ ({ index, item }: { item: Tag; index: number }) => (+ <TagItem tag={item} onPress={onPress} />),- [onPress, tags]+ [onPress]);return (@@ -280,14 +300,11 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {fwdRef={inputRef}autoCapitalize="none"onChangeText={(v) => {- setQuery(sanitizeTag(v));- checkQueryExists(sanitizeTag(v));- }}- onFocusInput={() => {- setFocus(true);- }}- onBlurInput={() => {- setFocus(false);+ clearTimeout(timerRef.current);+ timerRef.current = setTimeout(() => {+ setQuery(sanitizeTag(v));+ checkQueryExists(sanitizeTag(v));+ }, 300);}}onSubmit={() => {onSubmit();@@ -324,7 +341,7 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {}}><LegendList- data={tags?.placeholders || []}+ data={tags || []}extraData={tags}keyboardShouldPersistTapskeyboardDismissMode="interactive"@@ -367,16 +384,13 @@ ManageTags.present = (ids?: string[]) => {export default ManageTags;const TagItem = ({- id,- tags,- onPress+ onPress,+ tag}: {- id: string | number;- tags: VirtualizedGrouping<Tag>;+ tag: Tag;onPress: (id: string) => void;}) => {const { colors } = useThemeColors();- const [tag] = useDBItem(id, "tag", tags);const selection = useTagItemSelection((state) =>tag?.id ? state.selection[tag?.id] : false);