Skip to content
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.

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

Feat add router onion skinning preview #1063

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions packages/canvas/DesignCanvas/src/DesignCanvas.vue
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,24 @@ export default {
})
})

function updatePreviewId(previewId, replace = false) {
const url = new URL(window.location.href)
if (previewId) {
if (previewId === url.searchParams.get('previewid')) {
return
}
url.searchParams.set('previewid', previewId)
} else {
url.searchParams.delete('previewid')
}
if (replace) {
window.history.replaceState({}, '', url)
} else {
window.history.pushState({}, '', url)
}
usePage().postLocationHistoryChanged({ previewId })
}

return {
removeNode,
canvasSrc,
Expand All @@ -264,6 +282,7 @@ export default {
getPageAncestors: usePage().getAncestors,
getBaseInfo: () => getMetaApi(META_SERVICE.GlobalService).getBaseInfo(),
addHistoryDataChangedCallback,
updatePreviewId,
ast,
getBlockByName: useMaterial().getBlockByName,
useModal,
Expand Down
3 changes: 2 additions & 1 deletion packages/canvas/render/src/RenderMain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { getPageAncestors } from './material-function/page-getter'
import CanvasEmpty from './canvas-function/CanvasEmpty.vue'
import { setCurrentPage } from './canvas-function/page-switcher'
import { useThrottleFn } from '@vueuse/core'
import { useRouterPreview } from './canvas-function/router-preview'

// global-context singleton
const { context: globalContext, setContext: setGlobalContext } = useContext()
Expand Down Expand Up @@ -135,7 +136,7 @@ export default defineComponent({
pageContext.setCssScopeId(props.cssScopeId || `data-te-page-${pageContext.pageId}`)
if (props.entry) {
provide('page-ancestors', pageAncestors)

provide('page-preview', useRouterPreview().previewPath)
const updatePageAncestor = () => {
if (routerViewSetting.viewMode === 'standalone') {
pageAncestors.value = []
Expand Down
79 changes: 79 additions & 0 deletions packages/canvas/render/src/canvas-function/router-preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import { onUnmounted, ref } from 'vue'
import { getController } from './controller'
import { getPageAncestors } from '../material-function/page-getter'

export function useRouterPreview() {
const pageId = ref(getController().getBaseInfo().pageId)
const previewId = ref(getController().getBaseInfo().previewId)
const updatePreviewId = getController().updatePreviewId
const previewFullPath = ref([])
const previewPath = ref([])

async function calcNewPreviewFullPath() {
if (!pageId.value) {
if (previewId.value) {
updatePreviewId(undefined, true)
return
}
previewFullPath.value = []
previewPath.value = []
return
}
if (!previewId.value) {
previewFullPath.value = await getPageAncestors(pageId.value)
previewPath.value = []
return
}

if (previewFullPath.value[previewFullPath.value.length - 1] !== previewId.value) {
// previewId changed
const fullPath = await getPageAncestors(previewId.value)
if (fullPath.includes(pageId.value)) {
previewFullPath.value = fullPath
} else {
updatePreviewId(pageId.value, true)
}
}

if (previewFullPath.value.includes(pageId.value)) {
// only pageId changed and fast move
const fastJumpIndex = previewFullPath.value.indexOf(pageId.value)
if (fastJumpIndex + 1 < previewFullPath.value.length) {
previewPath.value = previewFullPath.value.slice(fastJumpIndex + 1)
} else {
previewPath.value = []
}
} else {
previewFullPath.value = await getPageAncestors(pageId.value)
previewPath.value = []
updatePreviewId(pageId.value, true)
}
}

const cancel = getController().addHistoryDataChangedCallback(() => {
const newPageId = getController().getBaseInfo().pageId
const newPreviewId = getController().getBaseInfo().previewId
const pageIdChanged = newPageId !== pageId.value
const previewIdChanged = newPreviewId !== previewId.value
if (pageIdChanged) {
pageId.value = newPageId
}
if (previewIdChanged) {
previewId.value = newPreviewId
}
if (previewIdChanged || pageIdChanged) {
calcNewPreviewFullPath()
}
})

onUnmounted(() => {
cancel()
})

calcNewPreviewFullPath()

return {
previewPath,
previewFullPath
}
}
16 changes: 12 additions & 4 deletions packages/canvas/render/src/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,13 @@ const getChildren = (schema, mergeScope, pageContext) => {
}
function getRenderPageId(currentPageId, isPageStart) {
const pagePathFromRoot = (inject('page-ancestors') as Ref<any[]>).value
const pagePreviewFromCurrentPageChild = (inject('page-preview') as Ref<any[]>).value
const fullPath = [...pagePathFromRoot, ...pagePreviewFromCurrentPageChild]

function getNextChild(currentPageId) {
const index = pagePathFromRoot.indexOf(currentPageId)
if (index > -1 && index + 1 < pagePathFromRoot.length) {
return pagePathFromRoot[index + 1]
const index = fullPath.indexOf(currentPageId)
if (index > -1 && index + 1 < fullPath.length) {
return fullPath[index + 1]
}
return null
}
Expand Down Expand Up @@ -256,7 +258,13 @@ export const renderer = defineComponent({
if (renderPageId) {
return h(getPage(renderPageId), {
key: ancestors,
[DESIGN_TAGKEY]: `${componentName}`
[DESIGN_TAGKEY]: `${componentName}`,
...(pageContext.active && !isPageStart
? {
[DESIGN_UIDKEY]: schema.id,
draggable: true
}
: {})
})
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/common/composable/defaultGlobalService.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ const getBaseInfo = () => {
const id = paramsMap.get('id')
const blockId = paramsMap.get('blockid')
const pageId = paramsMap.get('pageid')
const previewId = paramsMap.get('previewid')
const type = paramsMap.get('type')
const version = paramsMap.get('version')

return {
type: type || 'app',
id,
pageId,
previewId,
blockId,
version
}
Expand Down
Loading