Skip to content

Commit 0c8f16d

Browse files
committed
feat: mdxPage type to folder type
1 parent e4bab58 commit 0c8f16d

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

packages/markdown-editor/src/components/sidebar/sortable-tree/sortable-item-wrapper.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ const SortableTreeMenuNotMemoized = function SortableItemWrapper({
7272
}
7373

7474
const parent = findParent(items, active)
75-
7675
const props: SortableItemWrapperProps = {
7776
setNodeRef,
7877
setActivatorNodeRef,
@@ -87,7 +86,7 @@ const SortableTreeMenuNotMemoized = function SortableItemWrapper({
8786
active,
8887
style,
8988
parent: parent,
90-
previousItem, // over된 item의 이전 item을 의미함
89+
previousItem, // over된 item의 이전 item을 의미함 // TODO: remove
9190
isParentOver: getIsParentOver(parent, over?.id),
9291
isChildrenOver: over ? item.childrenIds.includes(over?.id) : false,
9392
depth,

packages/markdown-editor/src/components/sidebar/sortable-tree/sortable-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export const SortableItem = forwardRef<HTMLDivElement, SortableItemProps>((props
8585

8686
useEffect(() => {
8787
if (!isEdit) return
88-
// Dispached by other component
88+
// action이 edit이 아닌 경우
8989
if (actionInfo === null || !isEditAction(actionInfo)) {
9090
setIsEdit(false)
9191
return

packages/markdown-editor/src/components/sidebar/utils/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function getProjection(
200200
depth = minDepth
201201
}
202202

203-
if (previousItem && (previousItem.kind === 'MdxPage' || previousItem.type === 'separator')) {
203+
if (previousItem && previousItem.type === 'separator') {
204204
depth = previousItem.depth
205205
}
206206

packages/markdown-editor/src/components/sidebar/utils/normalizePageToTreeData.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export function normalizePageToTreeData(
1111
parent: PageItem | Item | null = null,
1212
): SortableItem[] {
1313
return items.map((item, index) => {
14-
const open = route.startsWith(removeCodeFromRoute(item.route))
15-
const opened = collapsedTree.has(item.id)
16-
const collapsed = item.kind === 'Folder' && (open || opened)
14+
const isFocus = route.startsWith(removeCodeFromRoute(item.route))
15+
const isCollapsed = collapsedTree.has(item.id)
16+
const collapsed = item.kind === 'Folder' && (isFocus || isCollapsed)
1717
const data: Omit<SortableItem, 'childrenIds'> = {
1818
...item,
1919
parentId,

0 commit comments

Comments
 (0)