Skip to content

fix: show correct embed prompt for GitHub issue vs pull request #1619

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

Open
liu971227-sys wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: show correct embed prompt for GitHub issue vs pull request #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 22 additions & 3 deletions src/cloud/components/Editor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ const Editor = ({
const [shortcodeConvertMenu, setShortcodeConvertMenu] = useState<{
pos: PositionRange
cb: Callback
promptLabel?: string
} | null>(null)
const initialRenderDone = useRef(false)
const { docsMap, workspacesMap, loadDoc } = useNav()
Expand Down Expand Up @@ -392,8 +393,8 @@ const Editor = ({
},
})
pasteFormatPlugin(editor, {
openMenu: (pos, cb) => {
setShortcodeConvertMenu({ pos, cb })
openMenu: (pos, cb, promptLabel) => {
setShortcodeConvertMenu({ pos, cb, promptLabel })
},
closeMenu: () => {
setShortcodeConvertMenu(null)
Expand All @@ -410,6 +411,8 @@ const Editor = ({
return {
replacement: `[[ ${entityType} id="${org}/${repo}#${num}" ]]`,
promptMenu: true,
promptLabel:
type === 'pull' ? 'Embed Pull Request?' : 'Embed Issue?',
}
}
}
Expand Down Expand Up @@ -1031,6 +1034,9 @@ const Editor = ({
<StyledShortcodeConvertMenu
style={shortcodeConvertMenuStyle}
>
{shortcodeConvertMenu.promptLabel != null && (
<p>{shortcodeConvertMenu.promptLabel}</p>
)}
<button onClick={() => shortcodeConvertMenu.cb(false)}>
Dismiss
</button>
Expand Down Expand Up @@ -1124,6 +1130,19 @@ const StyledShortcodeConvertMenu = styled.div`
border-radius: 5px;
box-shadow: ${({ theme }) => theme.colors.shadow};

p {
margin: 0;
width: 200px;
line-height: 25px;
padding: ${({ theme }) => theme.sizes.spaces.xsm}px
${({ theme }) => theme.sizes.spaces.sm}px;
background-color: ${({ theme }) => theme.colors.background.secondary};
color: ${({ theme }) => theme.colors.text.primary};
font-size: ${({ theme }) => theme.sizes.fonts.sm}px;
border-radius: 5px 5px 0 0;
border-bottom: solid 1px ${({ theme }) => theme.colors.border.main};
}

button {
display: block;
width: 200px;
Expand All @@ -1135,7 +1154,7 @@ const StyledShortcodeConvertMenu = styled.div`
font-size: ${({ theme }) => theme.sizes.fonts.sm}px;
text-align: left;

&:first-child {
&:first-of-type {
border-radius: 5px 5px 0 0;
}

Expand Down
11 changes: 8 additions & 3 deletions src/cloud/lib/editor/plugins/pasteFormatPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ export type Callback = (convert: boolean) => void
type FormatterResult = {
replacement: string | null
promptMenu: boolean
promptLabel?: string
}

interface Config {
openMenu: (position: PositionRange, callback: Callback) => void
openMenu: (
position: PositionRange,
callback: Callback,
promptLabel?: string
) => void
closeMenu: () => void
formatter: (pasted: string[]) => FormatterResult
}
Expand Down Expand Up @@ -53,7 +58,7 @@ export const pasteFormatPlugin = (
return
}

const { replacement, promptMenu } = formatter(change.text)
const { replacement, promptMenu, promptLabel } = formatter(change.text)

if (replacement === null) {
return
Expand All @@ -78,7 +83,7 @@ export const pasteFormatPlugin = (
close()
}

openMenu(posRange, callback)
openMenu(posRange, callback, promptLabel)
open = true
})
}
7 changes: 5 additions & 2 deletions src/cloud/lib/hooks/editor/docEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export function useDocEditor({
const [shortcodeConvertMenu, setShortcodeConvertMenu] = useState<{
pos: PositionRange
cb: Callback
promptLabel?: string
} | null>(null)
const suggestionsRef = useRef<Hint[]>([])
const { loadDoc } = useNav()
Expand Down Expand Up @@ -220,8 +221,8 @@ export function useDocEditor({
},
})
pasteFormatPlugin(editor, {
openMenu: (pos, cb) => {
setShortcodeConvertMenu({ pos, cb })
openMenu: (pos, cb, promptLabel) => {
setShortcodeConvertMenu({ pos, cb, promptLabel })
},
closeMenu: () => {
setShortcodeConvertMenu(null)
Expand All @@ -238,6 +239,8 @@ export function useDocEditor({
return {
replacement: `[[ ${entityType} id="${org}/${repo}#${num}" ]]`,
promptMenu: true,
promptLabel:
type === 'pull' ? 'Embed Pull Request?' : 'Embed Issue?',
}
}
}
Expand Down
25 changes: 22 additions & 3 deletions src/mobile/components/pages/DocEditPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const Editor = ({
const [shortcodeConvertMenu, setShortcodeConvertMenu] = useState<{
pos: PositionRange
cb: Callback
promptLabel?: string
} | null>(null)
const initialRenderDone = useRef(false)
const titleRef = useRef<HTMLInputElement>(null)
Expand Down Expand Up @@ -277,8 +278,8 @@ const Editor = ({
},
})
pasteFormatPlugin(editor, {
openMenu: (pos, cb) => {
setShortcodeConvertMenu({ pos, cb })
openMenu: (pos, cb, promptLabel) => {
setShortcodeConvertMenu({ pos, cb, promptLabel })
},
closeMenu: () => {
setShortcodeConvertMenu(null)
Expand All @@ -295,6 +296,8 @@ const Editor = ({
return {
replacement: `[[ ${entityType} id="${org}/${repo}#${num}" ]]`,
promptMenu: true,
promptLabel:
type === 'pull' ? 'Embed Pull Request?' : 'Embed Issue?',
}
}
}
Expand Down Expand Up @@ -586,6 +589,9 @@ const Editor = ({
/>
{shortcodeConvertMenu !== null && (
<StyledShortcodeConvertMenu style={shortcodeConvertMenuStyle}>
{shortcodeConvertMenu.promptLabel != null && (
<p>{shortcodeConvertMenu.promptLabel}</p>
)}
<button onClick={() => shortcodeConvertMenu.cb(false)}>
Dismiss
</button>
Expand Down Expand Up @@ -649,6 +655,19 @@ const StyledShortcodeConvertMenu = styled.div`
margin-top: ${({ theme }) => theme.sizes.spaces.xsm}px;
border-radius: 5px;

p {
margin: 0;
width: 200px;
line-height: 25px;
padding: ${({ theme }) => theme.sizes.spaces.xsm}px
${({ theme }) => theme.sizes.spaces.sm}px;
background-color: ${({ theme }) => theme.colors.variants.primary.base};
color: ${({ theme }) => theme.colors.variants.primary.text};
font-size: ${({ theme }) => theme.sizes.fonts.sm}px;
border-radius: 5px 5px 0 0;
border-bottom: solid 1px ${({ theme }) => theme.colors.background.quaternary};
}

button {
display: block;
width: 200px;
Expand All @@ -660,7 +679,7 @@ const StyledShortcodeConvertMenu = styled.div`
font-size: ${({ theme }) => theme.sizes.fonts.sm}px;
text-align: left;

&:first-child {
&:first-of-type {
border-radius: 5px 5px 0 0;
}

Expand Down