Skip to content

Commit 9de00f2

Browse files
authored
Merge pull request #269 from code-hike/two-panel-rows
`rows` prop when you have two panels
2 parents d5658fc + c82ceda commit 9de00f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+47
-5811
lines changed

Diff for: packages/mdx/dev/content/rows.mdx

+19
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,22 @@ console.log(7)
6565
```
6666

6767
</CH.Code>
68+
69+
<CH.Code rows={[2, "focus"]} lineNumbers >
70+
71+
```js foo.js
72+
console.log(2)
73+
```
74+
75+
---
76+
77+
```js bar.js focus=3:4
78+
console.log(1)
79+
console.log(2)
80+
console.log(3)
81+
console.log(4)
82+
console.log(5)
83+
console.log(7)
84+
```
85+
86+
</CH.Code>

Diff for: packages/mdx/src/mini-editor/editor-shift.tsx

+26-6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,26 @@ type Snapshot = {
5656
southTabs: TabsSnapshot | null
5757
}
5858

59+
function northConfig(codeConfig: CodeConfig) {
60+
if (Array.isArray(codeConfig.rows)) {
61+
return {
62+
...codeConfig,
63+
rows: codeConfig.rows[0],
64+
}
65+
}
66+
return codeConfig
67+
}
68+
69+
function southConfig(codeConfig: CodeConfig) {
70+
if (Array.isArray(codeConfig.rows)) {
71+
return {
72+
...codeConfig,
73+
rows: codeConfig.rows[1],
74+
}
75+
}
76+
return codeConfig
77+
}
78+
5979
export function useTransition(
6080
ref: React.RefObject<HTMLDivElement>,
6181
prev: EditorStep,
@@ -119,7 +139,7 @@ export function useTransition(
119139
style: northStyle,
120140
children: (
121141
<CodeTransition
122-
codeConfig={codeConfig}
142+
codeConfig={northConfig(codeConfig)}
123143
prevFile={prevNorthFile}
124144
nextFile={nextNorthFile}
125145
t={t}
@@ -136,7 +156,7 @@ export function useTransition(
136156
style: southStyle!,
137157
children: (
138158
<CodeTransition
139-
codeConfig={codeConfig}
159+
codeConfig={southConfig(codeConfig)}
140160
prevFile={prevSouthFile!}
141161
nextFile={nextSouthFile!}
142162
t={t}
@@ -180,7 +200,7 @@ function startingPosition(
180200
},
181201
children: (
182202
<CodeTransition
183-
codeConfig={codeConfig}
203+
codeConfig={northConfig(codeConfig)}
184204
prevFile={prevNorthFile}
185205
nextFile={prevNorthFile}
186206
t={0}
@@ -201,7 +221,7 @@ function startingPosition(
201221
},
202222
children: (
203223
<CodeTransition
204-
codeConfig={codeConfig}
224+
codeConfig={southConfig(codeConfig)}
205225
prevFile={prevSouthFile!}
206226
nextFile={prevSouthFile!}
207227
t={0}
@@ -249,7 +269,7 @@ function endingPosition(
249269
},
250270
children: (
251271
<CodeTransition
252-
codeConfig={codeConfig}
272+
codeConfig={northConfig(codeConfig)}
253273
prevFile={nextNorthFile}
254274
nextFile={nextNorthFile}
255275
t={1}
@@ -270,7 +290,7 @@ function endingPosition(
270290
},
271291
children: (
272292
<CodeTransition
273-
codeConfig={codeConfig}
293+
codeConfig={southConfig(codeConfig)}
274294
prevFile={nextSouthFile!}
275295
nextFile={nextSouthFile!}
276296
t={1}

Diff for: packages/mdx/src/smooth-code/code-tween.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export type CodeConfig = {
4848
showCopyButton?: boolean
4949
showExpandButton?: boolean
5050
staticMediaQuery?: string
51-
rows?: number | "focus"
51+
rows?: number | "focus" | (number | "focus")[]
5252
debug?: boolean
5353
}
5454

@@ -86,7 +86,7 @@ export function CodeTween({
8686
map(tween, tween => tween.focus),
8787
config.minColumns || DEFAULT_MIN_COLUMNS,
8888
config.lineNumbers || false,
89-
config.rows,
89+
config.rows as number | "focus",
9090
[config.parentHeight]
9191
)
9292

Diff for: packages/storybook/public/codehike.png

-35 KB
Binary file not shown.

Diff for: packages/storybook/public/favicon-16x16.png

-1.18 KB
Binary file not shown.

Diff for: packages/storybook/public/favicon-32x32.png

-2.6 KB
Binary file not shown.

Diff for: packages/storybook/public/favicon-96x96.png

-7.54 KB
Binary file not shown.

Diff for: packages/storybook/public/favicon.ico

-1.12 KB
Binary file not shown.

Diff for: packages/storybook/public/logo.png

-17.7 KB
Binary file not shown.

Diff for: packages/storybook/src/assets/code-with-links.mdx

-20
This file was deleted.

Diff for: packages/storybook/src/assets/code.mdx

-61
This file was deleted.

Diff for: packages/storybook/src/assets/count.mp4

-951 KB
Binary file not shown.

Diff for: packages/storybook/src/assets/scrollycoding.basic.mdx

-79
This file was deleted.

Diff for: packages/storybook/src/assets/scrollycoding.deps.mdx

-79
This file was deleted.

0 commit comments

Comments
 (0)