From 824da56397d3162184c647a02ccf54842bd58ee1 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:15:50 -0700 Subject: [PATCH 01/11] Modify ifxr --- src/components/AER.tsx | 15 ++++++--------- src/contents/14.jp.tsx | 2 ++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index cee26c632..fe55e66e0 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2016,18 +2016,15 @@ export default { /> ), ifxr: ( - - } - finalArgPriorityAggHighlights={[1]} - finalFuncPriorityAggHighlights={[1, 2]} + caption={} + argPriorityAggHighlights={[1]} + funcPriorityAggHighlights={[1, 2]} /> ), vkpm: ( diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index eae7053f1..adb8cd22e 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -330,6 +330,8 @@ export default () => ( + {AER.zxux} + {AER.ifxr}

ちなみに前回説明した通り、 From d0db530e7335a7dec513c49f4ba8a78493011dce Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:20:00 -0700 Subject: [PATCH 02/11] Change davn, add dxum --- src/components/AER.tsx | 24 +++++++++++++----------- src/contents/14.jp.tsx | 2 ++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index fe55e66e0..d48140eb8 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2050,21 +2050,23 @@ export default { variableSize="sm" /> ), - davn: ( - - } variableSize="sm" - finalArgPriorityAggHighlights={[1]} - finalFuncPriorityAggHighlights={[3, 4]} + /> + ), + davn: ( + } + variableSize="sm" + argPriorityAggHighlights={[1]} + funcPriorityAggHighlights={[3, 4]} /> ), qltx: ( diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index adb8cd22e..dc93b2f65 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -386,6 +386,8 @@ export default () => ( が追加されました。

+ {AER.dxum} + {AER.davn} ) From c2a64405de01d5affa781e79335d6ea6f215cac7 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:23:55 -0700 Subject: [PATCH 03/11] Add fora, eobj, change osqg --- src/components/AER.tsx | 19 ++++++++++++++++--- src/contents/14.jp.tsx | 4 ++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index d48140eb8..6193c39e8 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2183,14 +2183,27 @@ export default { variableSize="sm" /> ), + fora: ( + + ), + eobj: ( + + ), osqg: ( - ), vrwt: ( diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index dc93b2f65..e517e78d2 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -568,6 +568,10 @@ export default () => ( という順番になります。

+ {AER.fora} + + {AER.eobj} + {AER.osqg}

そして、最終的に From 4b9e1b2cf31e41d45e9e32d11285c7222a5e087c Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:32:30 -0700 Subject: [PATCH 04/11] Add xjae, change xsve --- src/components/AER.tsx | 12 ++++++++---- src/contents/14.jp.tsx | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index 6193c39e8..2896f16ca 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2236,14 +2236,18 @@ export default { variableSize="sm" /> ), + xjae: ( + + ), xsve: ( - ), urhc: ( diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index e517e78d2..f181a8b7e 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -661,6 +661,8 @@ export default () => ( の部分が次のように変化する機能です。この変化が、先ほどの計算を可能にしているわけです。

+ {AER.xjae} + {AER.xsve}

しかし、冒頭でも書いた通り、「 From 0a4830125b30cb715a30cae5003d4554873a91b3 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:38:47 -0700 Subject: [PATCH 05/11] Change urhc, Add igrt, woft --- src/components/AER.tsx | 21 +++++++++++++++++---- src/contents/15.jp.tsx | 4 ++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index 2896f16ca..e5436596b 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2250,14 +2250,27 @@ export default { initialState="magicalExpanded" /> ), - urhc: ( - + ), + woft: ( + + ), + urhc: ( + ), tdau: ( diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index 713fc32f8..8f59eec61 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -54,6 +54,10 @@ export default () => (

といった計算を行うことができます。

+ {AER.igrt} + + {AER.woft} + {AER.urhc}

しかし、「 From 94d6f20d830a6e47a2e23240e90f1ed54b8827e0 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:47:07 -0700 Subject: [PATCH 06/11] Change mscz, add nnhc, pzvr --- src/components/AER.tsx | 21 ++++++++++++++++++--- src/contents/15.jp.tsx | 4 ++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index e5436596b..f4744d743 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2471,15 +2471,30 @@ export default { speed={1.75} /> ), + nnhc: ( + + ), + pzvr: ( + + ), mscz: ( - ), jreq: ( diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index 8f59eec61..b068138c1 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -325,6 +325,10 @@ export default () => ( 、ということになります！

+ {AER.nnhc} + + {AER.pzvr} + {AER.mscz} ) From 18228856185ad304ade9bef074b31f008ed0b85c Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:50:16 -0700 Subject: [PATCH 07/11] Add vpmj, change uitu --- src/components/AER.tsx | 13 ++++++++++--- src/contents/15.jp.tsx | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index f4744d743..bba50d4ab 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2510,15 +2510,22 @@ export default { superFastForward /> ), + vpmj: ( + + ), uitu: ( - ), bozr: ( diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index b068138c1..d8729ccd3 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -398,6 +398,8 @@ export default () => ( になります。

+ {AER.vpmj} + {AER.uitu}

From 470cb4ea37de06bc8d8e55532163976e169091ad Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 20:53:59 -0700 Subject: [PATCH 08/11] Change wxqy, add angp --- src/components/AER.tsx | 13 ++++++++++--- src/contents/15.jp.tsx | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index bba50d4ab..ccafe1d13 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2541,15 +2541,22 @@ export default { superFastForward /> ), + angp: ( + + ), wxqy: ( - ), wcwd: ( diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index d8729ccd3..31225243a 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -416,6 +416,8 @@ export default () => ( になります。

+ {AER.angp} + {AER.wxqy}

つまり、 From 258fa5b0c0215a77094ee96b46db4ca314564e5f Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 21:00:22 -0700 Subject: [PATCH 09/11] change dret zfcz, add fotb, xsgz --- src/components/AER.tsx | 26 ++++++++++++++++++++------ src/contents/15.jp.tsx | 4 ++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index ccafe1d13..3487acf4e 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2603,14 +2603,21 @@ export default { superFastForward /> ), - dret: ( - + ), + dret: ( + ), @@ -2627,14 +2634,21 @@ export default { superFastForward /> ), - zfcz: ( - + ), + zfcz: ( + ), diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index 31225243a..c0632afad 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -554,6 +554,8 @@ export default () => ( になります。

+ {AER.xsgz} + {AER.dret} ) @@ -593,6 +595,8 @@ export default () => ( になります。

+ {AER.fotb} + {AER.zfcz} ) From f8c3e06aad00b00c47716ca841d4c29a8d66f4bf Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 21:04:51 -0700 Subject: [PATCH 10/11] Add missing --- src/contents/15.jp.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index c0632afad..a4d891855 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -46,6 +46,8 @@ export default () => ( は次のように変化します。

+ {AER.xjae} + {AER.xsve}

この @@ -85,6 +87,8 @@ export default () => ( の変化に注目してみます。

+ {AER.xjae} + {AER.xsve}

変化後の弁当箱にも From d3b9dad1be1dc58609f49d8c4d374dd05a5b013a Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 19 Jun 2019 21:05:58 -0700 Subject: [PATCH 11/11] Remove ExpressionRunnerPairSimple --- src/components/AER.tsx | 3 +- src/components/ExpressionRunnerSeparator.tsx | 8 +- src/components/ExpressionRunnerShorthand.tsx | 132 ------------------- 3 files changed, 3 insertions(+), 140 deletions(-) diff --git a/src/components/AER.tsx b/src/components/AER.tsx index 3487acf4e..4cad01e16 100644 --- a/src/components/AER.tsx +++ b/src/components/AER.tsx @@ -2,8 +2,7 @@ import React from 'react' import { ExpressionRunnerSimple, ExpressionRunnerPlayButtonOnly, - ExpressionRunnerSingleStep, - ExpressionRunnerPairSimple + ExpressionRunnerSingleStep } from 'src/components/ExpressionRunnerShorthand' import * as lessonExpressions from 'src/lib/lessonExpressions' import H from 'src/components/H' diff --git a/src/components/ExpressionRunnerSeparator.tsx b/src/components/ExpressionRunnerSeparator.tsx index 25850487f..380fd6488 100644 --- a/src/components/ExpressionRunnerSeparator.tsx +++ b/src/components/ExpressionRunnerSeparator.tsx @@ -4,18 +4,14 @@ import { spaces } from 'src/lib/theme' import Emoji from 'src/components/Emoji' import { P } from 'src/components/ContentTags' -const ExpressionRunnerSeparator = ({ - fastForward -}: { - fastForward?: boolean -}) => ( +const ExpressionRunnerSeparator = () => (

- {fastForward ? '⏬' : '🔽'} + ⬇️

) diff --git a/src/components/ExpressionRunnerShorthand.tsx b/src/components/ExpressionRunnerShorthand.tsx index 4a30e628d..e81643b95 100644 --- a/src/components/ExpressionRunnerShorthand.tsx +++ b/src/components/ExpressionRunnerShorthand.tsx @@ -7,7 +7,6 @@ import { ExpressionContainer, SteppedExpressionContainer } from 'src/types/ExpressionContainerTypes' -import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' const initializeInstructions = ({ nextIteration, @@ -209,137 +208,6 @@ ExpressionRunnerPlayButtonOnly.defaultProps = { explanationsVisibility: 'hiddenInitialPausedOnly' } -export const ExpressionRunnerPairSimple = ({ - expressionContainer, - initialState, - isDone, - explanationsVisibility, - hideFirstExplanations, - showPriorities, - showAllShowSteps, - caption, - bottomRightBadgeOverrides, - highlightOverrides, - highlightOverrideActiveAfterStart, - variableSize, - containerSize, - skipAlphaConvert, - nextIteration, - nextIterations, - showOnlyFocused, - highlightOverridesCallArgAndFuncUnboundOnly, - finalState, - finalCaption, - finalNextIteration, - finalNextIterations, - finalFastForward, - finalArgPriorityAggHighlights, - finalFuncPriorityAggHighlights, - intermediateState, - intermediateCaption, - intermediateNextIteration, - intermediateNextIterations, - intermediateArgPriorityAggHighlights, - intermediateFuncPriorityAggHighlights -}: ExpressionRunnerSimpleProps & { - hideFirstExplanations?: boolean - finalState?: ExpressionRunnerSimpleProps['initialState'] - finalCaption?: ExpressionRunnerSimpleProps['caption'] - finalNextIteration?: ExpressionRunnerSimpleProps['nextIteration'] - finalNextIterations?: ExpressionRunnerSimpleProps['nextIterations'] - finalFastForward?: boolean - finalArgPriorityAggHighlights?: ExpressionRunnerSimpleProps['argPriorityAggHighlights'] - finalFuncPriorityAggHighlights?: ExpressionRunnerSimpleProps['funcPriorityAggHighlights'] - intermediateState?: ExpressionRunnerSimpleProps['initialState'] - intermediateCaption?: ExpressionRunnerSimpleProps['caption'] - intermediateNextIteration?: ExpressionRunnerSimpleProps['nextIteration'] - intermediateNextIterations?: ExpressionRunnerSimpleProps['nextIterations'] - intermediateArgPriorityAggHighlights?: ExpressionRunnerSimpleProps['argPriorityAggHighlights'] - intermediateFuncPriorityAggHighlights?: ExpressionRunnerSimpleProps['funcPriorityAggHighlights'] -}) => ( - <> - - {intermediateState && ( - <> - - - - )} - - - -) - -ExpressionRunnerPairSimple.defaultProps = { - ...ExpressionRunnerSimple.defaultProps -} - export const ExpressionRunnerSingleStep = ({ expressionContainer, initialState,