Skip to content

Smarter editor height #98

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
merged 3 commits into from
Dec 25, 2021
Merged

Smarter editor height #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fad8b64
Change editor frame
pomber Dec 24, 2021
5c1465b
Add memo to story
pomber Dec 24, 2021
d32feb5
Better height for next file
pomber Dec 25, 2021
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
49 changes: 17 additions & 32 deletions packages/mini-editor/src/editor-frame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import React from "react"
import {
MiniFrame,
FrameButtons,
} from "@code-hike/mini-frame"
import { FrameButtons } from "@code-hike/mini-frame"
import { useClasser, Classes } from "@code-hike/classer"
import { EditorTheme } from "@code-hike/smooth-code/dist/themes"
import { getColor, ColorName } from "./theme-colors"
Expand Down Expand Up @@ -58,20 +55,21 @@ export const EditorFrame = React.forwardRef<
ref
) {
const c = useClasser("ch-editor")

return (
<MiniFrame
<div
ref={ref}
{...rest}
className="ch-frame ch-editor-frame"
style={{
height,
["--ch-content-background" as any]: getColor(
background: getColor(
theme,
ColorName.EditorGroupHeaderBackground
),
...style,
}}
className={c("frame") + " " + className}
overflow="unset"
titleBar={
>
<div className={"ch-frame-title-bar"}>
<TabsContainer
tabs={northPanel.tabs}
showFrameButtons={true}
Expand All @@ -80,27 +78,19 @@ export const EditorFrame = React.forwardRef<
theme={theme}
onTabClick={onTabClick}
/>
}
{...rest}
>
</div>
<div
data-ch-panel="north"
className={c("body")}
style={northPanel.style}
children={northPanel.children}
/>
{southPanel && (
<div
data-ch-panel="south"
style={{
display: "flex",
flexDirection: "column",
...southPanel.style,
}}
>
<>
<div
className={"ch-frame-title-bar"}
style={{ background: "none" }}
style={{
transform: southPanel.style?.transform,
}}
>
<TabsContainer
tabs={southPanel.tabs}
Expand All @@ -112,18 +102,13 @@ export const EditorFrame = React.forwardRef<
/>
</div>
<div
className={c("body")}
data-ch-panel="south"
children={southPanel.children}
style={{
flexGrow: 1,
flexShrink: 1,
minHeight: 0,
}}
style={southPanel.style}
/>
</div>
</>
)}
{terminalPanel}
</MiniFrame>
</div>
)
})

Expand Down
89 changes: 49 additions & 40 deletions packages/mini-editor/src/editor-shift.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,25 @@ export function useTransition(
backward: boolean,
codeConfig: CodeConfig
): Transition {
// prevSnapshot has the dimensions of the editor for t=0
// nextSnapshot has the dimensions of the editor for t=1
const { prevSnapshot, nextSnapshot } = useSnapshots(
ref,
prev,
next
)

// we return the default styles for t=0 until we measure the dimensions
if (!prevSnapshot) {
return startingPosition(prev, next, codeConfig)
}

// and the same for t=1
if (!nextSnapshot) {
return endingPosition(prev, next, codeConfig)
}

// TODO this should be commented
// if (t === 0) {
// return startingPosition(prev, next, codeConfig)
// }
Expand Down Expand Up @@ -114,7 +119,10 @@ export function useTransition(
prevFile={prevNorthFile}
nextFile={nextNorthFile}
t={t}
parentHeight={northStyle.height as string}
parentHeight={
(northStyle.height ||
northStyle.minHeight) as string
}
/>
),
},
Expand All @@ -127,7 +135,10 @@ export function useTransition(
prevFile={prevSouthFile!}
nextFile={nextSouthFile!}
t={t}
parentHeight={southStyle?.height as string}
parentHeight={
(southStyle?.height ||
southStyle?.minHeight) as string
}
/>
),
},
Expand All @@ -150,12 +161,6 @@ function startingPosition(
nextSouthFile,
} = getStepFiles(prev, next, true)

const northHeight = inputSouthPanel
? `calc((100% - var(--ch-title-bar-height)) * ${inputNorthPanel.heightRatio})`
: "100%"

const southHeight = `calc((100% - var(--ch-title-bar-height)) * ${inputSouthPanel?.heightRatio} + var(--ch-title-bar-height))`

return {
northPanel: {
tabs: inputNorthPanel.tabs.map(title => ({
Expand All @@ -164,15 +169,16 @@ function startingPosition(
style: {},
})),
style: {
height: northHeight,
flexGrow: 1,
overflow: "hidden",
},
children: (
<CodeTransition
codeConfig={codeConfig}
prevFile={prevNorthFile}
nextFile={nextNorthFile}
nextFile={prevNorthFile}
t={0}
parentHeight={northHeight}
parentHeight={"0"}
/>
),
},
Expand All @@ -183,15 +189,16 @@ function startingPosition(
style: {},
})),
style: {
height: `calc((100% - var(--ch-title-bar-height)) * ${inputSouthPanel.heightRatio} + var(--ch-title-bar-height))`,
flexGrow: 1,
overflow: "hidden",
},
children: (
<CodeTransition
codeConfig={codeConfig}
prevFile={prevSouthFile!}
nextFile={nextSouthFile!}
nextFile={prevSouthFile!}
t={0}
parentHeight={southHeight}
parentHeight={"0"}
/>
),
},
Expand Down Expand Up @@ -221,12 +228,6 @@ function endingPosition(
nextNorthFile = nextSouthFile!
}

const northHeight = inputSouthPanel
? `calc((100% - var(--ch-title-bar-height)) * ${inputNorthPanel.heightRatio})`
: "100%"

const southHeight = `calc((100% - var(--ch-title-bar-height)) * ${inputSouthPanel?.heightRatio} + var(--ch-title-bar-height))`

return {
northPanel: {
tabs: inputNorthPanel.tabs.map(title => ({
Expand All @@ -235,15 +236,16 @@ function endingPosition(
style: {},
})),
style: {
height: northHeight,
flexGrow: 1,
overflow: "hidden",
},
children: (
<CodeTransition
codeConfig={codeConfig}
prevFile={prevNorthFile}
prevFile={nextNorthFile}
nextFile={nextNorthFile}
t={1}
parentHeight={northHeight}
parentHeight={"1"}
/>
),
},
Expand All @@ -254,15 +256,16 @@ function endingPosition(
style: {},
})),
style: {
height: southHeight,
flexGrow: 1,
overflow: "hidden",
},
children: (
<CodeTransition
codeConfig={codeConfig}
prevFile={prevSouthFile!}
prevFile={nextSouthFile!}
nextFile={nextSouthFile!}
t={1}
parentHeight={southHeight}
parentHeight={"1"}
/>
),
},
Expand All @@ -285,7 +288,7 @@ function CodeTransition({
const htmlProps = {
...codeConfig?.htmlProps,
style: {
height: "unset",
height: "100%",
...codeConfig?.htmlProps?.style,
},
}
Expand Down Expand Up @@ -403,7 +406,7 @@ function getPanelStyles(
) {
return {
northStyle: {
height: prev.northHeight,
minHeight: prev.northHeight,
},
}
}
Expand All @@ -420,14 +423,14 @@ function getPanelStyles(
) {
return {
northStyle: {
height: tween(
minHeight: tween(
prev.northHeight,
next.northHeight,
t
),
},
southStyle: {
height: prev.southHeight,
minHeight: prev.southHeight,
},
}
}
Expand All @@ -444,13 +447,13 @@ function getPanelStyles(
) {
return {
northStyle: {
height: prev.northHeight,
minHeight: prev.northHeight,
},
southStyle: {
position: "relative",
height: tween(
minHeight: tween(
prev.southHeight,
next.northHeight + next.titleBarHeight,
next.northHeight,
t
),
transform: `translateY(${tween(
Expand All @@ -474,15 +477,15 @@ function getPanelStyles(
) {
return {
northStyle: {
height: tween(
minHeight: tween(
prev.northHeight,
next.northHeight,
t
),
},
southStyle: {
position: "relative",
height: next.southHeight!,
minHeight: next.southHeight!,
},
}
}
Expand All @@ -499,12 +502,12 @@ function getPanelStyles(
) {
return {
northStyle: {
height: next.northHeight,
minHeight: next.northHeight,
},
southStyle: {
position: "relative",
height: tween(
prev.northHeight + prev.titleBarHeight,
minHeight: tween(
prev.northHeight,
next.southHeight!,
t
),
Expand All @@ -524,10 +527,14 @@ function getPanelStyles(
// +---+---+
return {
northStyle: {
height: tween(prev.northHeight, next.northHeight, t),
minHeight: tween(
prev.northHeight,
next.northHeight,
t
),
},
southStyle: {
height: tween(
minHeight: tween(
prev.southHeight!,
next.southHeight!,
t
Expand Down Expand Up @@ -775,6 +782,7 @@ function useSnapshots(

useLayoutEffect(() => {
if (!prevSnapshot) {
// debugger
setState(s => ({
...s,
prevSnapshot: {
Expand All @@ -783,6 +791,7 @@ function useSnapshots(
},
}))
} else if (!nextSnapshot) {
// debugger
setState(s => ({
...s,
nextSnapshot: {
Expand Down
Loading