bdc5c92 · bridge · git.iko.soy

git.iko.soy/bridge

fix: simplify inputsigil

commitbdc5c920ef454ab72094d61ca33e852745936065 authorMatt Condon (shrugs) <mattgcondon@gmail.com> dateTue 6 Aug 2019, 21:16 (7 years ago) parente8991de

4 files changed+13−17

compare with master

unifiedsplit

src/components/InputSigil.js+9−11 src/components/MaybeSigil.js+1−1 src/components/Passport.js+1−2 src/form/Inputs.js+2−3

src/components/InputSigil.js+9−11

@@ -1,19 +1,18 @@

11import React, { useEffect, useState } from 'react';

22import { Just } from 'folktale/maybe';

3−import * as ob from 'urbit-ob';

54import MaybeSigil from './MaybeSigil';

7−const selectColorway = (pass, fail, focused) => {

8− if (pass) {

6+const selectColorway = (valid, error, active) => {

7+ if (valid) {

98 return ['#2AA779', '#FFFFFF'];

109 }

1110

12− if (focused) {

11+ if (active) {

1312 return ['#4330FC', '#FFFFFF'];

1413 }

1514

16− if (fail) {

15+ if (error) {

1716 return ['#F8C134', '#FFFFFF'];

1817 }

1918

@@ -24,25 +23,24 @@ export default function InputSigil({

2423 className,

2524 patp,

2625 size,

27− pass,

26+ valid,

2827 error,

29− focused,

28+ active,

3029 ...rest

3130}) {

3231 const [lastValidPatp, setLastValidPatp] = useState(patp);

3332

3433 useEffect(() => {

35− if (ob.isValidPatp(patp)) {

34+ if (valid) {

3635 setLastValidPatp(patp);

3736 }

38− }, [patp]);

37+ }, [patp, valid]);

3938

4039 return (

4140 <MaybeSigil

4241 patp={Just(lastValidPatp)}

4342 size={size}

44− colors={selectColorway(pass, error, focused)}

45− margin={0}

43+ colors={selectColorway(valid, error, active)}

4644 {...rest}

4745 />

4846 );

src/components/MaybeSigil.js+1−1

@@ -14,7 +14,7 @@ export default function MaybeSigil({ className, patp, size, ...rest }) {

1414 });

1515

1616 return validPatp ? (

17− <Sigil patp={validPatp} size={size} margin={0} {...rest} />

17+ <Sigil patp={validPatp} size={size} {...rest} />

1818 ) : (

1919 <AspectRatio aspectRatio={1} />

2020 );

src/components/Passport.js+1−2

@@ -75,7 +75,7 @@ function Passport({ point, className, ticket = null, address = Nothing() }) {

7575 return (

7676 <Grid gap={4} className={cn('bg-black r8 p7', className)}>

7777 <Grid.Item cols={[1, 4]}>

78− <MaybeSigil patp={name} size={64} margin={0} />

78+ <MaybeSigil patp={name} size={64} />

7979 </Grid.Item>

8080 <Grid.Item as={Flex} cols={[4, 13]} col justify="between">

8181 <Flex.Item className="mono white f5">{visualName}</Flex.Item>

@@ -141,7 +141,6 @@ Passport.Mini = function MiniPassport({ point, className, inverted, ...rest }) {

141141 <Sigil

142142 patp={name}

143143 size={64}

144− margin={0}

145144 colors={inverted ? INVERTED_COLORWAY : undefined}

146145 />

147146 </Grid.Item>

src/form/Inputs.js+2−3

@@ -97,10 +97,9 @@ export function PointInput({ name, size = 4, ...rest }) {

9797 <InputSigil

9898 patp={value}

9999 size={44}

100− margin={8}

101− pass={valid}

102− focused={active}

100+ valid={valid}

103101 error={error}

102+ active={active}

104103 />

105104 ) : null

106105 }