Skip to content

Fix legacy task list position calculation #3491

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
siddharthkp merged 8 commits into from
Jul 12, 2023
Merged

Fix legacy task list position calculation #3491

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac211f0
Fix bug with legacy task list position calculation
nicolleromero Jul 6, 2023
b456e32
Add test for hierarchy task list combination
nicolleromero Jul 6, 2023
8e5df65
Make check for code fences more robust per spec
nicolleromero Jul 6, 2023
c2e70df
Update to use regex test
nicolleromero Jul 10, 2023
22cc801
Add changeset
nicolleromero Jul 10, 2023
89809a3
Update changeset
nicolleromero Jul 10, 2023
26b488f
add component name in changelog
siddharthkp Jul 11, 2023
f5e867b
Merge branch 'main' into fix-legacy-task-list-checkboxes
siddharthkp Jul 11, 2023
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
10 changes: 9 additions & 1 deletion src/drafts/MarkdownViewer/_useListInteraction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import {ListItem, listItemToString, parseListItem} from '../MarkdownEditor/_useL

type TaskListItem = ListItem & {taskBox: '[ ]' | '[x]'}

const isCodeBlockDelimiter = (line: string) => line.trimStart().startsWith('```')

@iansan5653 iansan5653 Jul 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The spec is a little looser than this, so there will be some types of code blocks that don't get caught.

They can be delimited by tildes instead of backticks:

~~~
example
~~~

They can also have more than three backticks:

````
example
````

In this case, you'd need to keep track of how long the starting delimiter is so that you can ensure the ending delimiter is the same length.

@nicolleromero nicolleromero Jul 6, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great point! Will make that update.


const isTaskListItem = (item: ListItem | null): item is TaskListItem => typeof item?.taskBox === 'string'

const toggleTaskListItem = (item: TaskListItem): TaskListItem => ({
Expand Down Expand Up @@ -43,11 +45,17 @@ export const useListInteraction = ({
const onToggleItem = useCallback(
(toggledItemIndex: number) => () => {
const lines = markdownRef.current.split('\n')
let inCodeBlock = false

for (let lineIndex = 0, taskIndex = 0; lineIndex < lines.length; lineIndex++) {
if (isCodeBlockDelimiter(lines[lineIndex])) {
inCodeBlock = !inCodeBlock
continue
}

const parsedLine = parseListItem(lines[lineIndex])

if (!isTaskListItem(parsedLine)) continue
if (!isTaskListItem(parsedLine) || inCodeBlock) continue

if (taskIndex === toggledItemIndex) {
const updatedLine = listItemToString(toggleTaskListItem(parsedLine))
Expand Down