Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

V2 Tabs - Separate PR addressing comments #1634

Merged
merged 7 commits into from
Nov 21, 2020

Conversation

fairlighteth
Copy link
Contributor

@fairlighteth fairlighteth commented Nov 19, 2020

V2 Tabs - Separate PR addressing comments

Addresses comments left in #1629 also waterfalls in

@fairlighteth fairlighteth marked this pull request as ready for review November 19, 2020 14:10
@gnosis-info
Copy link

Travis automatic deployment:

@fairlighteth fairlighteth mentioned this pull request Nov 20, 2020
src/components/common/Tabs/Tabs.tsx Outdated Show resolved Hide resolved
Support string/ReactNode for tab content.

Co-authored-by: David <david.sato64@gmail.com>
@W3stside W3stside changed the title Michel comments edit V2 Tabs - Separate PR addressing comments Nov 20, 2020
@W3stside
Copy link
Contributor

@biocom make sure to check it before commiting recommendations:

ERROR in /home/travis/build/gnosis/dex-react/src/components/common/Tabs/Tabs.tsx
ERROR in /home/travis/build/gnosis/dex-react/src/components/common/Tabs/Tabs.tsx(43,19):
TS2322: Type 'ReactNode' is not assignable to type 'string | undefined'.
  Type 'null' is not assignable to type 'string | undefined'.

you can apply the change locally and then run npx tsc --noEmit to check errors. Looks like a type clash in this case probaly found in another file where you render the content

@W3stside W3stside self-requested a review November 20, 2020 13:00
@W3stside W3stside merged commit 7a95487 into michel-comments Nov 21, 2020
@W3stside W3stside deleted the michel-comments-edit branch November 21, 2020 10:04
W3stside added a commit that referenced this pull request Nov 23, 2020
* TabItem knows too much

1. id is not needed here as it is passed in by the smart parent
2. isActive in Wrapper isnt needed as activeColor can indicate isActive

* simplify TabContent & change activeColor to required

* Tabs changes

1. simplified as no more need for id or isActive
2. destructure in props
3. remove implicit type form useState hook

* V2 Tabs - Separate PR addressing comments (#1634)

* Refactxor.

* Refactxor.

* Fix ts any.

* Update src/components/OrderBuySell/index.tsx

Support string/ReactNode for tab content.

Co-authored-by: David <david.sato64@gmail.com>

* Refactor tabs

* Remove console.log references

* Fix content check.

Co-authored-by: David <david.sato64@gmail.com>

* fix develop merge conflicts

* TabItem as button (merge error fix)

Co-authored-by: Michel <31534717+biocom@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants