Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat: implement drag and drop for resource order in editor (#3337)
boojack3fbc4d853904
diff --git a/store/db/mysql/resource.go b/store/db/mysql/resource.goindex f077f0ba9..070584aed 100644--- a/store/db/mysql/resource.go+++ b/store/db/mysql/resource.go@@ -75,7 +75,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stfields = append(fields, "`blob`")}- query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s ORDER BY `created_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))+ query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s ORDER BY `updated_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)if find.Offset != nil {diff --git a/store/db/postgres/resource.go b/store/db/postgres/resource.goindex 30232bbd2..ae38eddf2 100644--- a/store/db/postgres/resource.go+++ b/store/db/postgres/resource.go@@ -71,7 +71,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*st%sFROM resourceWHERE %s- ORDER BY created_ts DESC+ ORDER BY updated_ts DESC`, strings.Join(fields, ", "), strings.Join(where, " AND "))if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)diff --git a/store/db/sqlite/resource.go b/store/db/sqlite/resource.goindex d6952034e..20507a80c 100644--- a/store/db/sqlite/resource.go+++ b/store/db/sqlite/resource.go@@ -68,7 +68,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stfields = append(fields, "`blob`")}- query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s ORDER BY `created_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))+ query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s ORDER BY `updated_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)if find.Offset != nil {diff --git a/web/package.json b/web/package.jsonindex 36c035807..85906884a 100644--- a/web/package.json+++ b/web/package.json@@ -8,6 +8,9 @@"postinstall": "cd ../proto && buf generate"},"dependencies": {+ "@dnd-kit/core": "^6.1.0",+ "@dnd-kit/sortable": "^8.0.0",+ "@dnd-kit/utilities": "^3.2.2","@emotion/react": "^11.11.4","@emotion/styled": "^11.11.5","@github/relative-time-element": "^4.4.0",diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yamlindex 9ba5a42a6..d3a0ac17f 100644--- a/web/pnpm-lock.yaml+++ b/web/pnpm-lock.yaml@@ -8,6 +8,15 @@ importers:.:dependencies:+ '@dnd-kit/core':+ specifier: ^6.1.0+ '@dnd-kit/sortable':+ specifier: ^8.0.0+ version: 8.0.0(@dnd-kit/[email protected]([email protected]([email protected]))([email protected]))([email protected])+ '@dnd-kit/utilities':+ specifier: ^3.2.2+ version: 3.2.2([email protected])'@emotion/react':specifier: ^11.11.4version: 11.11.4(@types/[email protected])([email protected])@@ -348,6 +357,28 @@ packages:engines: {node: '>=12'}hasBin: true+ '@dnd-kit/[email protected]':+ resolution: {integrity: sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==}+ peerDependencies:+ react: '>=16.8.0'++ '@dnd-kit/[email protected]':+ resolution: {integrity: sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==}+ peerDependencies:+ react: '>=16.8.0'+ react-dom: '>=16.8.0'++ '@dnd-kit/[email protected]':+ resolution: {integrity: sha512-U3jk5ebVXe1Lr7c2wU7SBZjcWdQP+j7peHJfCspnA81enlu88Mgd7CC8Q+pub9ubP7eKVETzJW+IBAhsqbSu/g==}+ peerDependencies:+ '@dnd-kit/core': ^6.1.0+ react: '>=16.8.0'++ '@dnd-kit/[email protected]':+ resolution: {integrity: sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==}+ peerDependencies:+ react: '>=16.8.0'+'@emotion/[email protected]':resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==}@@ -3234,6 +3265,31 @@ snapshots:'@bufbuild/buf-win32-arm64': 1.31.0'@bufbuild/buf-win32-x64': 1.31.0+ '@dnd-kit/[email protected]([email protected])':+ dependencies:+ react: 18.3.1+ tslib: 2.6.2++ dependencies:+ '@dnd-kit/accessibility': 3.1.0([email protected])+ '@dnd-kit/utilities': 3.2.2([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ tslib: 2.6.2++ '@dnd-kit/[email protected](@dnd-kit/[email protected]([email protected]([email protected]))([email protected]))([email protected])':+ dependencies:+ '@dnd-kit/utilities': 3.2.2([email protected])+ react: 18.3.1+ tslib: 2.6.2++ '@dnd-kit/[email protected]([email protected])':+ dependencies:+ react: 18.3.1+ tslib: 2.6.2+'@emotion/[email protected]':dependencies:'@babel/helper-module-imports': 7.24.3diff --git a/web/src/components/MemoEditor/ResourceListView.tsx b/web/src/components/MemoEditor/ResourceListView.tsxindex dd18a628e..9275c413c 100644--- a/web/src/components/MemoEditor/ResourceListView.tsx+++ b/web/src/components/MemoEditor/ResourceListView.tsx@@ -1,6 +1,9 @@+import { DndContext, closestCenter, MouseSensor, TouchSensor, useSensor, useSensors, DragEndEvent } from "@dnd-kit/core";+import { arrayMove, SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";import { Resource } from "@/types/proto/api/v1/resource_service";import Icon from "../Icon";import ResourceIcon from "../ResourceIcon";+import SortableItem from "./SortableItem";interface Props {resourceList: Resource[];@@ -9,33 +12,48 @@ interface Props {const ResourceListView = (props: Props) => {const { resourceList, setResourceList } = props;+ const sensors = useSensors(useSensor(MouseSensor), useSensor(TouchSensor));const handleDeleteResource = async (name: string) => {setResourceList(resourceList.filter((resource) => resource.name !== name));};+ const handleDragEnd = (event: DragEndEvent) => {+ const { active, over } = event;++ if (over && active.id !== over.id) {+ const oldIndex = resourceList.findIndex((resource) => resource.name === active.id);+ const newIndex = resourceList.findIndex((resource) => resource.name === over.id);++ setResourceList(arrayMove(resourceList, oldIndex, newIndex));+ }+ };+return (- <>- {resourceList.length > 0 && (- <div className="w-full flex flex-row justify-start flex-wrap gap-2 mt-2">- {resourceList.map((resource) => {- return (- <div- key={resource.name}- className="max-w-full flex flex-row justify-start items-center flex-nowrap gap-x-1 bg-zinc-100 dark:bg-zinc-900 px-2 py-1 rounded text-gray-500 dark:text-gray-400"- >- <ResourceIcon resource={resource} className="!w-4 !h-4 !opacity-100" />- <span className="text-sm max-w-[8rem] truncate">{resource.filename}</span>- <Icon.X- className="w-4 h-auto cursor-pointer opacity-60 hover:opacity-100"- onClick={() => handleDeleteResource(resource.name)}- />- </div>- );- })}- </div>- )}- </>+ <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>+ <SortableContext items={resourceList.map((resource) => resource.name)} strategy={verticalListSortingStrategy}>+ {resourceList.length > 0 && (+ <div className="w-full flex flex-row justify-start flex-wrap gap-2 mt-2">+ {resourceList.map((resource) => {+ return (+ <SortableItem+ key={resource.name}+ id={resource.name}+ className="max-w-full w-auto flex flex-row justify-start items-center flex-nowrap gap-x-1 bg-zinc-100 dark:bg-zinc-900 px-2 py-1 rounded hover:shadow-sm text-gray-500 dark:text-gray-400"+ >+ <ResourceIcon resource={resource} className="!w-4 !h-4 !opacity-100" />+ <span className="text-sm max-w-[8rem] truncate">{resource.filename}</span>+ <Icon.X+ className="w-4 h-auto cursor-pointer opacity-60 hover:opacity-100"+ onClick={() => handleDeleteResource(resource.name)}+ />+ </SortableItem>+ );+ })}+ </div>+ )}+ </SortableContext>+ </DndContext>);};diff --git a/web/src/components/MemoEditor/SortableItem.tsx b/web/src/components/MemoEditor/SortableItem.tsxnew file mode 100644index 000000000..e8f3cd6e6--- /dev/null+++ b/web/src/components/MemoEditor/SortableItem.tsx@@ -0,0 +1,25 @@+import { useSortable } from "@dnd-kit/sortable";+import { CSS } from "@dnd-kit/utilities";++interface Props {+ id: string;+ className: string;+ children: React.ReactNode;+}++const SortableItem: React.FC<Props> = ({ id, className, children }: Props) => {+ const { attributes, listeners, setNodeRef, transform, transition } = useSortable({ id });++ const style = {+ transform: CSS.Transform.toString(transform),+ transition,+ };++ return (+ <div ref={setNodeRef} style={style} {...attributes} {...listeners} className={className}>+ {children}+ </div>+ );+};++export default SortableItem;