Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.

Update 15 #105

Merged
merged 1 commit into from
Oct 25, 2019
Merged

Update 15 #105

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
3 changes: 2 additions & 1 deletion scripts/lib/initialExpressionContainers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2260,7 +2260,8 @@ export const bgid = initializeExpressionContainer([
}
}
}
}
},
{ name: 'blankNumber', highlighted: true }
])

export const jypn = initializeExpressionContainer([
Expand Down
18 changes: 13 additions & 5 deletions src/components/ConditionalBorder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ const ConditionalBorder = ({
falseCase: falseCaseColor,
condition: conditionColor
}[type]
const { shadeNonNumbers, shadeNonHighlightedFunc } = useContext(
VariableShadeContext
)
const {
shadeNonNumbers,
shadeNonHighlightedFunc,
shadeNonFactorial
} = useContext(VariableShadeContext)
return (
<>
{shaded && <Shade />}
Expand All @@ -90,7 +92,11 @@ const ConditionalBorder = ({
left: 0.3em;
display: inline-flex;
font-size: ${fontSize(variableSizeOverrides || variableSize)};
opacity: ${shadeNonNumbers || shadeNonHighlightedFunc ? 0.7 : 1};
opacity: ${shadeNonNumbers ||
shadeNonHighlightedFunc ||
shadeNonFactorial
? 0.7
: 1};
`}
>
{type === 'trueCase' && (
Expand Down Expand Up @@ -119,7 +125,9 @@ const ConditionalBorder = ({
border-top: 2px solid ${colors('indigo300')};
`}
>
{(shadeNonNumbers || shadeNonHighlightedFunc) && <Shade />}
{(shadeNonNumbers || shadeNonHighlightedFunc || shadeNonFactorial) && (
<Shade />
)}
</span>
</>
)
Expand Down
15 changes: 11 additions & 4 deletions src/components/VariableExpressionBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,11 @@ const VariableExpressionBox = ({ expression }: VariableExpressionBoxProps) => {
const { hidePriorities, variableSize } = useContext(ExpressionRunnerContext)
const { conditionalState } = useContext(ConditionalContext)
const { binaryState } = useContext(BinaryContext)
const { shadeNonNumbers, shadeNonHighlightedFunc } = useContext(
VariableShadeContext
)
const {
shadeNonNumbers,
shadeNonHighlightedFunc,
shadeNonFactorial
} = useContext(VariableShadeContext)

return (
<>
Expand All @@ -416,7 +418,12 @@ const VariableExpressionBox = ({ expression }: VariableExpressionBoxProps) => {
expression.name !== 'B')) ||
(shadeNonHighlightedFunc &&
(expression.shorthandFunc === undefined ||
expression.highlightType !== 'initialHighlighted'))) && (
expression.highlightType !== 'initialHighlighted')) ||
(shadeNonFactorial &&
expression.shorthandNumber !== 3 &&
expression.shorthandNumber !== 4 &&
expression.shorthandNumber !== 5 &&
expression.name !== 'blankNumber')) && (
<span
css={css`
display: block;
Expand Down
1 change: 1 addition & 0 deletions src/components/VariableShadeContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React from 'react'
export interface VariableShadeContextProps {
shadeNonNumbers?: true
shadeNonHighlightedFunc?: true
shadeNonFactorial?: true
}

export const variableShadeContextDefault: VariableShadeContextProps = {}
Expand Down
36 changes: 25 additions & 11 deletions src/contents/15.en.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import Emoji from 'src/components/Emoji'
import EmojiSeparator from 'src/components/EmojiSeparator'
import EmojiForLetter from 'src/components/EmojiForLetter'
import EmojiNumber from 'src/components/EmojiNumber'
import VariableShadeContext from 'src/components/VariableShadeContext'
import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator'
import CustomEmoji from 'src/components/CustomEmoji'
import TwoColGrid from 'src/components/TwoColGrid'
Expand Down Expand Up @@ -1156,17 +1157,28 @@ export default () => (
}
/>
<P>
先ほどの弁当箱の上の部分に <EmojiNumber number={3} />{' '}
を追加してみたぞ。
これを計算するには、
<HighlightBold>
先ほどの弁当箱の上の{' '}
<CustomEmoji type="blankNumber" /> の部分を{' '}
<EmojiNumber number={3} /> にして実行すればいい
</HighlightBold>
んだ。
</P>
</>
)
}
]}
/>
<R.Zlfx>
上の部分に <EmojiNumber number={3} /> を追加
</R.Zlfx>
<VariableShadeContext.Provider value={{ shadeNonFactorial: true }}>
<R.Kmgw>
<CustomEmoji type="blankNumber" /> の部分を…
</R.Kmgw>
<ExpressionRunnerSeparator />
<R.Zlfx>
<EmojiNumber number={3} /> に変えて実行すればいい
</R.Zlfx>
</VariableShadeContext.Provider>
<BubbleQuotes
quotes={[
{
Expand Down Expand Up @@ -1260,7 +1272,7 @@ export default () => (
]}
/>
<R.Zlfx>
上の部分に <EmojiNumber number={3} /> を追加
上の部分を <EmojiNumber number={3} /> に
<br />
して
<H args={{ name: 'run' }} /> すると…
Expand Down Expand Up @@ -1314,17 +1326,19 @@ export default () => (
}
/>
<P>
先ほどの弁当箱の上の部分に <EmojiNumber number={4} />{' '}
を追加してみたぞ。
先ほどの弁当箱の上の部分を <EmojiNumber number={4} />{' '}
にしてみたぞ。
</P>
</>
)
}
]}
/>
<R.Txxw>
上の部分に <EmojiNumber number={4} /> を追加
</R.Txxw>
<VariableShadeContext.Provider value={{ shadeNonFactorial: true }}>
<R.Txxw>
上の部分を <EmojiNumber number={4} /> に
</R.Txxw>
</VariableShadeContext.Provider>
<BubbleQuotes
quotes={[
{
Expand Down
84 changes: 63 additions & 21 deletions src/contents/15.jp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
UlLi
} from 'src/components/ContentTags'
import H from 'src/components/H'
import VariableShadeContext from 'src/components/VariableShadeContext'
import BubbleQuotes from 'src/components/BubbleQuotes'
import Emoji from 'src/components/Emoji'
import EmojiSeparator from 'src/components/EmojiSeparator'
Expand Down Expand Up @@ -183,12 +184,47 @@ export default () => (
</>
)
},
{
type: 'thinking',
children: (
<>
<P>分かった。では、</P>
<Ul>
<UlLi>
<Highlight>
<CustomEmoji type="blankNumberPurple" /> に{' '}
<EmojiNumber number={2} /> を、
</Highlight>
</UlLi>
<UlLi>
<Highlight>
<CustomEmoji type="blankNumberPink" /> に{' '}
<EmojiNumber number={3} /> を当てはめてみよう。
</Highlight>
</UlLi>
</Ul>
</>
)
}
]}
/>
<R.Jwsj>
<CustomEmoji type="blankNumberPurple" /> と{' '}
<CustomEmoji type="blankNumberPink" /> に…
</R.Jwsj>
<ExpressionRunnerSeparator />
<R.Mlnt>
<EmojiNumber number={2} /> と <EmojiNumber number={3} />{' '}
を当てはめてみる
</R.Mlnt>
<BubbleQuotes
quotes={[
{
type: 'thinking',
children: (
<>
<P>
分かった。じゃあ、こちらの{' '}
では、こちらの{' '}
<HighlightBold>
<EmojiNumber number={2} /> に変換できる弁当箱
</HighlightBold>
Expand Down Expand Up @@ -219,20 +255,13 @@ export default () => (
}}
/>
</R.Dmrz>
<P>
<CustomEmoji type="blankNumberPurple" /> と{' '}
<CustomEmoji type="blankNumberPink" />{' '}
の部分に入れてみよう。
</P>
<P>それぞれ使ってみよう！</P>
</>
)
}
]}
/>
<R.Hvfb>
<CustomEmoji type="blankNumberPurple" /> と{' '}
<CustomEmoji type="blankNumberPink" /> の部分に…
</R.Hvfb>
<R.Mlnt></R.Mlnt>
<ExpressionRunnerSeparator />
<R.Tpyg>
<EmojiNumber number={2} /> と <EmojiNumber number={3} />{' '}
Expand Down Expand Up @@ -1133,17 +1162,28 @@ export default () => (
}
/>
<P>
先ほどの弁当箱の上の部分に <EmojiNumber number={3} />{' '}
を追加してみたぞ。
これを計算するには、
<HighlightBold>
先ほどの弁当箱の上の{' '}
<CustomEmoji type="blankNumber" /> の部分を{' '}
<EmojiNumber number={3} /> にして実行すればいい
</HighlightBold>
んだ。
</P>
</>
)
}
]}
/>
<R.Zlfx>
上の部分に <EmojiNumber number={3} /> を追加
</R.Zlfx>
<VariableShadeContext.Provider value={{ shadeNonFactorial: true }}>
<R.Kmgw>
<CustomEmoji type="blankNumber" /> の部分を…
</R.Kmgw>
<ExpressionRunnerSeparator />
<R.Zlfx>
<EmojiNumber number={3} /> に変えて実行すればいい
</R.Zlfx>
</VariableShadeContext.Provider>
<BubbleQuotes
quotes={[
{
Expand Down Expand Up @@ -1237,7 +1277,7 @@ export default () => (
]}
/>
<R.Zlfx>
上の部分に <EmojiNumber number={3} /> を追加
上の部分を <EmojiNumber number={3} /> に
<br />
して
<H args={{ name: 'run' }} /> すると…
Expand Down Expand Up @@ -1291,17 +1331,19 @@ export default () => (
}
/>
<P>
先ほどの弁当箱の上の部分に <EmojiNumber number={4} />{' '}
を追加してみたぞ。
先ほどの弁当箱の上の部分を <EmojiNumber number={4} />{' '}
にしてみたぞ。
</P>
</>
)
}
]}
/>
<R.Txxw>
上の部分に <EmojiNumber number={4} /> を追加
</R.Txxw>
<VariableShadeContext.Provider value={{ shadeNonFactorial: true }}>
<R.Txxw>
上の部分を <EmojiNumber number={4} /> に
</R.Txxw>
</VariableShadeContext.Provider>
<BubbleQuotes
quotes={[
{
Expand Down
Loading