Fix zoom CSS on zoom
This commit is contained in:
parent
b2360550d9
commit
5d12a2fd54
6 changed files with 17 additions and 2 deletions
|
@ -130,7 +130,6 @@ const TranslatedShape = memo(
|
||||||
|
|
||||||
const center = getShapeUtils(shape).getCenter(shape)
|
const center = getShapeUtils(shape).getCenter(shape)
|
||||||
const rotation = shape.rotation * (180 / Math.PI)
|
const rotation = shape.rotation * (180 / Math.PI)
|
||||||
|
|
||||||
const transform = `
|
const transform = `
|
||||||
rotate(${rotation}, ${center})
|
rotate(${rotation}, ${center})
|
||||||
translate(${shape.point})
|
translate(${shape.point})
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import Command from './command'
|
import Command from './command'
|
||||||
import history from '../history'
|
import history from '../history'
|
||||||
import { Data } from 'types'
|
import { Data } from 'types'
|
||||||
|
import tld from 'utils/tld'
|
||||||
import storage from 'state/storage'
|
import storage from 'state/storage'
|
||||||
|
|
||||||
export default function changePage(data: Data, toPageId: string): void {
|
export default function changePage(data: Data, toPageId: string): void {
|
||||||
|
@ -17,11 +18,15 @@ export default function changePage(data: Data, toPageId: string): void {
|
||||||
storage.loadPage(data, data.document.id, toPageId)
|
storage.loadPage(data, data.document.id, toPageId)
|
||||||
data.currentPageId = toPageId
|
data.currentPageId = toPageId
|
||||||
data.currentParentId = toPageId
|
data.currentParentId = toPageId
|
||||||
|
|
||||||
|
tld.setZoomCSS(tld.getPageState(data).camera.zoom)
|
||||||
},
|
},
|
||||||
undo(data) {
|
undo(data) {
|
||||||
storage.loadPage(data, data.document.id, fromPageId)
|
storage.loadPage(data, data.document.id, fromPageId)
|
||||||
data.currentPageId = fromPageId
|
data.currentPageId = fromPageId
|
||||||
data.currentParentId = fromPageId
|
data.currentParentId = fromPageId
|
||||||
|
|
||||||
|
tld.setZoomCSS(tld.getPageState(data).camera.zoom)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,6 +2,7 @@ import Command from './command'
|
||||||
import history from '../history'
|
import history from '../history'
|
||||||
import { Data, Page, PageState } from 'types'
|
import { Data, Page, PageState } from 'types'
|
||||||
import { uniqueId } from 'utils/utils'
|
import { uniqueId } from 'utils/utils'
|
||||||
|
import tld from 'utils/tld'
|
||||||
import storage from 'state/storage'
|
import storage from 'state/storage'
|
||||||
|
|
||||||
export default function createPage(data: Data, goToPage = true): void {
|
export default function createPage(data: Data, goToPage = true): void {
|
||||||
|
@ -25,6 +26,7 @@ export default function createPage(data: Data, goToPage = true): void {
|
||||||
|
|
||||||
storage.savePage(data, data.document.id, page.id)
|
storage.savePage(data, data.document.id, page.id)
|
||||||
storage.saveDocumentToLocalStorage(data)
|
storage.saveDocumentToLocalStorage(data)
|
||||||
|
tld.setZoomCSS(tld.getPageState(data).camera.zoom)
|
||||||
},
|
},
|
||||||
undo(data) {
|
undo(data) {
|
||||||
const { page, currentPageId } = snapshot
|
const { page, currentPageId } = snapshot
|
||||||
|
@ -32,6 +34,7 @@ export default function createPage(data: Data, goToPage = true): void {
|
||||||
delete data.pageStates[page.id]
|
delete data.pageStates[page.id]
|
||||||
data.currentPageId = currentPageId
|
data.currentPageId = currentPageId
|
||||||
storage.saveDocumentToLocalStorage(data)
|
storage.saveDocumentToLocalStorage(data)
|
||||||
|
tld.setZoomCSS(tld.getPageState(data).camera.zoom)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
|
@ -87,6 +87,8 @@ export default function moveToPageCommand(data: Data, newPageId: string): void {
|
||||||
|
|
||||||
// Move to the new page
|
// Move to the new page
|
||||||
data.currentPageId = toPageId
|
data.currentPageId = toPageId
|
||||||
|
|
||||||
|
tld.setZoomCSS(tld.getPageState(data).camera.zoom)
|
||||||
},
|
},
|
||||||
undo(data) {
|
undo(data) {
|
||||||
const fromPageId = newPageId
|
const fromPageId = newPageId
|
||||||
|
@ -141,6 +143,8 @@ export default function moveToPageCommand(data: Data, newPageId: string): void {
|
||||||
tld.setSelectedIds(data, [...selectedIds])
|
tld.setSelectedIds(data, [...selectedIds])
|
||||||
|
|
||||||
data.currentPageId = toPageId
|
data.currentPageId = toPageId
|
||||||
|
|
||||||
|
tld.setZoomCSS(tld.getPageState(data).camera.zoom)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
|
@ -90,6 +90,8 @@ export function fastZoomUpdate(point: number[], delta: number): void {
|
||||||
|
|
||||||
data.pageStates[data.currentPageId].camera = deepClone(camera)
|
data.pageStates[data.currentPageId].camera = deepClone(camera)
|
||||||
|
|
||||||
|
tld.setZoomCSS(camera.zoom)
|
||||||
|
|
||||||
state.forceData(freeze(data))
|
state.forceData(freeze(data))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,6 +118,8 @@ export function fastPinchCamera(
|
||||||
|
|
||||||
data.pageStates[data.currentPageId] = { ...pageState }
|
data.pageStates[data.currentPageId] = { ...pageState }
|
||||||
|
|
||||||
|
tld.setZoomCSS(camera.zoom)
|
||||||
|
|
||||||
state.forceData(freeze(data))
|
state.forceData(freeze(data))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,5 +77,5 @@ export const defaultStyle: ShapeStyles = {
|
||||||
color: ColorStyle.Black,
|
color: ColorStyle.Black,
|
||||||
size: SizeStyle.Medium,
|
size: SizeStyle.Medium,
|
||||||
isFilled: false,
|
isFilled: false,
|
||||||
dash: DashStyle.Solid,
|
dash: DashStyle.Draw,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue