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: fix rendering slow in list
Ammar Ahmedc8716df6a695
diff --git a/apps/mobile/app/components/attachments/attachment-item.tsx b/apps/mobile/app/components/attachments/attachment-item.tsxindex 89774d281..357e846ce 100644--- a/apps/mobile/app/components/attachments/attachment-item.tsx+++ b/apps/mobile/app/components/attachments/attachment-item.tsx@@ -67,9 +67,8 @@ export const AttachmentItem = ({Actions.present(attachment, setAttachments, context);};- return (hideWhenNotDownloading &&- (!currentProgress || !currentProgress.value)) ||- !attachment ? null : (+ return hideWhenNotDownloading &&+ (!currentProgress || !currentProgress.value) ? null : (<TouchableOpacityactiveOpacity={0.9}onPress={onPress}@@ -80,104 +79,111 @@ export const AttachmentItem = ({padding: 12,paddingVertical: 6,borderRadius: 5,- backgroundColor: colors.secondary.background+ backgroundColor: colors.secondary.background,+ minHeight: 45}}>- <View- style={{- flexShrink: 1,- flexDirection: "row",- alignItems: "center"- }}- >- <View- style={{- justifyContent: "center",- alignItems: "center",- marginLeft: -5- }}- >- <Icon name="file" size={SIZE.xxxl} color={colors.primary.icon} />-- <Paragraph- adjustsFontSizeToFit- size={6}- color={colors.static.white}+ {!attachment ? null : (+ <>+ <Viewstyle={{- position: "absolute"+ flexShrink: 1,+ flexDirection: "row",+ alignItems: "center"}}>- {getFileExtension(attachment.filename).toUpperCase()}- </Paragraph>- </View>+ <View+ style={{+ justifyContent: "center",+ alignItems: "center",+ marginLeft: -5+ }}+ >+ <Icon name="file" size={SIZE.xxxl} color={colors.primary.icon} />- <View- style={{- flexShrink: 1,- marginLeft: 10- }}- >- <Paragraph- size={SIZE.sm - 1}- style={{- flexWrap: "wrap",- marginBottom: 2.5- }}- numberOfLines={1}- lineBreakMode="middle"- color={colors.primary.paragraph}- >- {attachment.filename}- </Paragraph>+ <Paragraph+ adjustsFontSizeToFit+ size={6}+ color={colors.static.white}+ style={{+ position: "absolute"+ }}+ >+ {getFileExtension(attachment.filename).toUpperCase()}+ </Paragraph>+ </View>- {!hideWhenNotDownloading ? (- <Paragraph color={colors.secondary.paragraph} size={SIZE.xs}>- {formatBytes(attachment.size)}{" "}- {currentProgress?.type- ? "(" + currentProgress.type + "ing - tap to cancel)"- : ""}- </Paragraph>- ) : null}- </View>- </View>+ <View+ style={{+ flexShrink: 1,+ marginLeft: 10+ }}+ >+ <Paragraph+ size={SIZE.sm - 1}+ style={{+ flexWrap: "wrap",+ marginBottom: 2.5+ }}+ numberOfLines={1}+ lineBreakMode="middle"+ color={colors.primary.paragraph}+ >+ {attachment.filename}+ </Paragraph>- {currentProgress ? (- <TouchableOpacity- activeOpacity={0.9}- onPress={() => {- if (encryption || !pressable) return;- db.fs().cancel(attachment.metadata.hash);- setCurrentProgress(undefined);- }}- style={{- justifyContent: "center",- marginLeft: 5,- marginTop: 5,- marginRight: -5- }}- >- <ProgressCircleComponent- size={SIZE.xxl}- progress={currentProgress?.value ? currentProgress?.value / 100 : 0}- showsText- textStyle={{- fontSize: 10- }}- color={colors.primary.accent}- formatText={(progress) => (progress * 100).toFixed(0)}- borderWidth={0}- thickness={2}- />- </TouchableOpacity>- ) : (- <>- {attachment.failed ? (- <IconButton- onPress={onPress}- name="alert-circle-outline"- color={colors.error.paragraph}- />- ) : null}+ {!hideWhenNotDownloading ? (+ <Paragraph color={colors.secondary.paragraph} size={SIZE.xs}>+ {formatBytes(attachment.size)}{" "}+ {currentProgress?.type+ ? "(" + currentProgress.type + "ing - tap to cancel)"+ : ""}+ </Paragraph>+ ) : null}+ </View>+ </View>++ {currentProgress ? (+ <TouchableOpacity+ activeOpacity={0.9}+ onPress={() => {+ if (encryption || !pressable) return;+ db.fs().cancel(attachment.hash);+ setCurrentProgress(undefined);+ }}+ style={{+ justifyContent: "center",+ marginLeft: 5,+ marginTop: 5,+ marginRight: -5+ }}+ >+ <ProgressCircleComponent+ size={SIZE.xxl}+ progress={+ currentProgress?.value ? currentProgress?.value / 100 : 0+ }+ showsText+ textStyle={{+ fontSize: 10+ }}+ color={colors.primary.accent}+ formatText={(progress) => (progress * 100).toFixed(0)}+ borderWidth={0}+ thickness={2}+ />+ </TouchableOpacity>+ ) : (+ <>+ {attachment.failed ? (+ <IconButton+ onPress={onPress}+ name="alert-circle-outline"+ color={colors.error.paragraph}+ />+ ) : null}+ </>+ )}</>)}</TouchableOpacity>diff --git a/apps/mobile/app/components/note-history/index.tsx b/apps/mobile/app/components/note-history/index.tsxindex 962a6c2ae..5c0c92841 100644--- a/apps/mobile/app/components/note-history/index.tsx+++ b/apps/mobile/app/components/note-history/index.tsx@@ -78,28 +78,30 @@ const HistoryItem = ({}, []);return (- item && (- <PressableButton- type="grayBg"- onPress={() => {- if (!item) return;- preview(item);- }}- customStyle={{- justifyContent: "space-between",- alignItems: "center",- paddingHorizontal: 12,- height: 45,- marginBottom: 10,- flexDirection: "row"- }}- >- <Paragraph>{getDate(item.dateCreated, item.dateModified)}</Paragraph>- <Paragraph color={colors.secondary.paragraph} size={SIZE.xs}>- {getTimeAgo(item.dateModified)}- </Paragraph>- </PressableButton>- )+ <PressableButton+ type="grayBg"+ onPress={() => {+ if (!item) return;+ preview(item);+ }}+ customStyle={{+ justifyContent: "space-between",+ alignItems: "center",+ paddingHorizontal: 12,+ height: 45,+ marginBottom: 10,+ flexDirection: "row"+ }}+ >+ {!item ? null : (+ <>+ <Paragraph>{getDate(item.dateCreated, item.dateModified)}</Paragraph>+ <Paragraph color={colors.secondary.paragraph} size={SIZE.xs}>+ {getTimeAgo(item.dateModified)}+ </Paragraph>+ </>+ )}+ </PressableButton>);};diff --git a/apps/mobile/app/components/sheets/move-notes/movenote.tsx b/apps/mobile/app/components/sheets/move-notes/movenote.tsxindex a115884b0..e8dd469ba 100644--- a/apps/mobile/app/components/sheets/move-notes/movenote.tsx+++ b/apps/mobile/app/components/sheets/move-notes/movenote.tsx@@ -21,7 +21,7 @@ import { VirtualizedGrouping } from "@notesnook/core";import { Note, Notebook } from "@notesnook/core/dist/types";import { useThemeColors } from "@notesnook/theme";import React, { RefObject, useEffect, useState } from "react";-import { Platform, View, useWindowDimensions } from "react-native";+import { View } from "react-native";import { ActionSheetRef } from "react-native-actions-sheet";import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";import { db } from "../../../common/database";@@ -51,9 +51,14 @@ export const MoveNotes = ({const { colors } = useThemeColors();const currentNotebook = notebook;const selectionCount = useItemSelectionStore(- (state) => Object.keys(state.selection)?.length > 0+ (state) =>+ Object.keys(state.selection).filter(+ (k) =>+ state.initialState?.[k] !== "selected" &&+ state.selection[k] !== "deselected"+ )?.length > 0);- const { height } = useWindowDimensions();+const [notes, setNotes] = useState<VirtualizedGrouping<Note>>();useEffect(() => {@@ -90,8 +95,10 @@ export const MoveNotes = ({<Viewstyle={{paddingHorizontal: 12,- maxHeight: Platform.OS === "ios" ? "96%" : "97%",- height: height * 0.9+ maxHeight: "100%",+ height: notes?.placeholders.length+ ? 50 * (notes?.placeholders.length + 2)+ : 300}}><Dialog context="local" />@@ -116,9 +123,11 @@ export const MoveNotes = ({</Paragraph></View>}+ estimatedItemSize={50}data={notes?.placeholders}renderItem={renderItem}/>+{selectionCount ? (<ButtononPress={async () => {@@ -139,77 +148,91 @@ export const MoveNotes = ({);};-const SelectableNoteItem = ({- id,- items-}: {- id: string | number;- items?: VirtualizedGrouping<Note>;-}) => {- const { colors } = useThemeColors();- const [item] = useDBItem(id, "note", items);- const selected = useItemSelectionStore((state) =>- item?.id ? state.selection[item.id] === "selected" : false- );- const exists = useItemSelectionStore((state) =>- item?.id ? state.initialState[item.id] === "selected" : false- );-- return !item || exists ? null : (- <PressableButton- testID="listitem.select"- onPress={() => {- if (!item) return;- useItemSelectionStore- .getState()- .markAs(item, selected ? "deselected" : "selected");- }}- type={"transparent"}- customStyle={{- paddingVertical: 12,- flexDirection: "row",- width: "100%",- justifyContent: "flex-start",- height: 50- }}- >- <IconButton- customStyle={{- backgroundColor: "transparent",- marginRight: 5- }}+const SelectableNoteItem = React.memo(+ ({+ id,+ items+ }: {+ id: string | number;+ items?: VirtualizedGrouping<Note>;+ }) => {+ const { colors } = useThemeColors();+ const [item] = useDBItem(id, "note", items);+ const selected = useItemSelectionStore((state) =>+ item?.id ? state.selection[item.id] === "selected" : false+ );+ const exists = useItemSelectionStore((state) =>+ item?.id ? state.initialState[item.id] === "selected" : false+ );++ return exists ? null : (+ <PressableButton+ testID="listitem.select"onPress={() => {if (!item) return;useItemSelectionStore.getState().markAs(item, selected ? "deselected" : "selected");}}- name={- selected ? "check-circle-outline" : "checkbox-blank-circle-outline"- }- type="selected"- color={selected ? colors.selected.icon : colors.primary.icon}- />-- <View- style={{- flexShrink: 1+ type={"transparent"}+ customStyle={{+ paddingVertical: 12,+ flexDirection: "row",+ width: "100%",+ justifyContent: "flex-start",+ height: 50}}>- <Paragraph numberOfLines={1}>{item?.title}</Paragraph>- {item.type == "note" && item.headline ? (- <Paragraph- numberOfLines={1}- color={colors?.secondary.paragraph}- size={SIZE.xs}- >- {item.headline}- </Paragraph>- ) : null}- </View>- </PressableButton>- );-};+ {!item ? null : (+ <>+ <IconButton+ customStyle={{+ backgroundColor: "transparent",+ marginRight: 5+ }}+ onPress={() => {+ if (!item) return;+ useItemSelectionStore+ .getState()+ .markAs(item, selected ? "deselected" : "selected");+ }}+ top={0}+ left={0}+ right={0}+ bottom={0}+ name={+ selected+ ? "check-circle-outline"+ : "checkbox-blank-circle-outline"+ }+ type="selected"+ color={selected ? colors.selected.icon : colors.primary.icon}+ />++ <View+ style={{+ flexShrink: 1+ }}+ >+ <Paragraph numberOfLines={1}>{item?.title}</Paragraph>+ {item.type == "note" && item.headline ? (+ <Paragraph+ numberOfLines={1}+ color={colors?.secondary.paragraph}+ size={SIZE.xs}+ >+ {item.headline}+ </Paragraph>+ ) : null}+ </View>+ </>+ )}+ </PressableButton>+ );+ }+);++SelectableNoteItem.displayName = "SelectableNoteItem";MoveNotes.present = (notebook?: Notebook) => {if (!notebook) return;