Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.8.8 -> v0.8.9 #214

Merged
merged 116 commits into from
Feb 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
f87c6bb
Feat #43 - Tag, Link components
sam-dassana Aug 14, 2020
97d5e4f
Fix #47 - Fix Link props - both onClick & href are undef (#48)
sam-dassana Aug 14, 2020
ba77ee2
Chore #49- Upgrade Storybook and dependencies (#50)
sam-dassana Aug 18, 2020
caa3e01
feat #38 - Add eslint and fix lint errors & warnings (#39)
sam-dassana Aug 11, 2020
cb4b319
Feat #43 - Tag, Link components
sam-dassana Aug 14, 2020
0a9a022
Fix #47 - Fix Link props - both onClick & href are undef (#48)
sam-dassana Aug 14, 2020
2584b28
Chore #49- Upgrade Storybook and dependencies (#50)
sam-dassana Aug 18, 2020
427e22f
feat #3 - Input field component (#53)
nancy-dassana Aug 21, 2020
e0c0bc6
Feat #30 - Toggle and Icon components (#52)
sam-dassana Aug 21, 2020
9a88334
chore #41 - Add verify labels GitHub action (#42)
parth-dassana Aug 12, 2020
5b98c5b
Feat #43 - Tag, Link components
sam-dassana Aug 14, 2020
74d7d33
Fix #47 - Fix Link props - both onClick & href are undef (#48)
sam-dassana Aug 14, 2020
b41ca47
Chore #49- Upgrade Storybook and dependencies (#50)
sam-dassana Aug 18, 2020
2dba6fe
feat #38 - Add eslint and fix lint errors & warnings (#39)
sam-dassana Aug 11, 2020
c17778d
chore #41 - Add verify labels GitHub action (#42)
parth-dassana Aug 12, 2020
cc37822
Feat #43 - Tag, Link components
sam-dassana Aug 14, 2020
df26689
Fix #47 - Fix Link props - both onClick & href are undef (#48)
sam-dassana Aug 14, 2020
8ed4189
Chore #49- Upgrade Storybook and dependencies (#50)
sam-dassana Aug 18, 2020
e64138e
feat #3 - Input field component (#53)
nancy-dassana Aug 21, 2020
fc5b3fa
Feat #30 - Toggle and Icon components (#52)
sam-dassana Aug 21, 2020
81a4894
Bump up version to 0.2.0
parth-dassana Aug 21, 2020
0eb414d
Comment out icon component
parth-dassana Aug 21, 2020
64e7c7a
Update package.json
parth-dassana Aug 21, 2020
3f0ac79
Update index.ts
parth-dassana Aug 21, 2020
94568de
Merge branch 'master' into dev
parth-dassana Aug 21, 2020
062ccb0
Bump up package.json
parth-dassana Aug 21, 2020
e12ea02
Update package-lock.json
parth-dassana Aug 21, 2020
0fa95d0
fix #58 - Address icon, styles, global css, and typescript issues (#59)
parth-dassana Aug 21, 2020
62204c3
Merge branch 'master' into dev
parth-dassana Aug 24, 2020
e39215c
Merge branch 'master' into dev
parth-dassana Aug 24, 2020
d6aca00
chore #63 - Update .eslintrc.js (#64)
sam-dassana Aug 25, 2020
7cce5bd
feat #61 - Skeleton loader component (#66)
nancy-dassana Aug 25, 2020
f7b7331
feat #65 - Form Component (#67)
nancy-dassana Aug 27, 2020
8082187
Merge branch 'master' into dev
parth-dassana Aug 27, 2020
c562ceb
v0.2.4 -> v0.2.5
parth-dassana Aug 27, 2020
31e099f
feat #71 - Notification component (#72)
nancy-dassana Sep 2, 2020
2e5d713
Merge branch 'master' into dev
Sep 2, 2020
06d095a
feat #76 - Refactor Form.Button to be Form.SubmitButton (#77)
nancy-dassana Sep 8, 2020
70bf0c4
Merge branch 'master' into dev
Sep 8, 2020
8bfb295
feat #62 - Table component (#70)
sam-dassana Sep 10, 2020
f6a1d6f
Merge branch 'master' into dev
Sep 10, 2020
459e57f
feat #79 - Select component (#82)
nancy-dassana Sep 16, 2020
f74f43b
feat #83 - Add data-test attribute to components (#85)
nancy-dassana Sep 17, 2020
fa5706e
Merge branch 'master' into dev
Sep 17, 2020
5f641a6
Update failing snapshots
Sep 17, 2020
cc56fab
feat #88 - Fix type exports for rollup (#89)
nancy-dassana Sep 17, 2020
a50bd53
Merge branch 'master' into dev
Sep 17, 2020
f2bdaa4
feat #84 - Radio group component (#91)
nancy-dassana Sep 20, 2020
06873bc
feat #81 - Tree component (#86)
sam-dassana Sep 23, 2020
6f85686
feat #93 - Tooltip component (#95)
nancy-dassana Sep 28, 2020
caf6a10
feat #94 - Popover component (#96)
nancy-dassana Sep 29, 2020
cd22a92
Merge branch 'master' into dev
Sep 29, 2020
7466916
Feat #99, #101, #100 - Add new avatar component and enhancements for …
nancy-dassana Oct 8, 2020
cca500d
Merge branch 'master' into dev
Oct 8, 2020
0f81ad2
feat #92 - Theming (#97)
sam-dassana Oct 9, 2020
fd256f0
chore #106 - refac all component exports from default to named, add s…
sam-dassana Oct 12, 2020
40c8370
fix #108 - Fix colors, refac stylguide export (#109)
sam-dassana Oct 12, 2020
0351f2d
Merge branch 'master' into dev
Oct 12, 2020
cbccafa
Components theming (#121)
nancy-dassana Oct 20, 2020
662fb10
Merge branch 'master' into dev
Oct 20, 2020
3c3a88f
fix #123 - Fix line height in styleguide (#124)
sam-dassana Oct 20, 2020
2d7cb76
Merge branch 'master' into dev
Oct 20, 2020
2c667b4
chore #127, fix #126: Refac & bug-fix Icon component, bug-fix fieldLa…
sam-dassana Oct 22, 2020
7399654
Merge branch 'master' into dev
Oct 22, 2020
dc1adeb
feat - Add Table row click handler (#131)
sam-dassana Oct 29, 2020
37ffa54
Merge branch 'master' into dev
Oct 29, 2020
825e343
Form enhancements (#134)
nancy-dassana Nov 3, 2020
b56a2d3
Merge branch 'master' into dev
Nov 3, 2020
0280f62
fix #136 - Fix package publish github action (#137)
nancy-dassana Nov 3, 2020
85d3293
Merge branch 'master' into dev
Nov 3, 2020
aac8ecb
feat #139 - Add focused prop to FormInput and allow refs to be passed…
nancy-dassana Nov 9, 2020
5205de3
Merge branch 'master' into dev
Nov 9, 2020
e1ba07f
feat #144 - Form Toggle (#145)
nancy-dassana Nov 19, 2020
ba16308
Merge branch 'master' into dev
Nov 19, 2020
fc078b6
feat #142 - Table refactor (#143)
sam-dassana Nov 19, 2020
6b3946d
feat #147, #148 - Update background colors and avatar styles (#149)
nancy-dassana Nov 20, 2020
68a74d0
Merge branch 'master' into dev
Nov 20, 2020
852fe69
fix #151 - Fix form toggle submit (#152)
nancy-dassana Nov 23, 2020
b7f9bd4
Merge branch 'master' into dev
Nov 23, 2020
b596bd0
chore #154 - Update themes & add new items to styleguide (#155)
sam-dassana Nov 26, 2020
9df18af
Merge branch 'master' into dev
Nov 26, 2020
17f6dfc
feat #157 - Add field errors to Form.Input (#158)
nancy-dassana Dec 2, 2020
104e177
Merge branch 'master' into dev
parth-dassana Dec 2, 2020
bbbfede
feat #159 - Add ColoredDot comp and integrate into Table (#161)
sam-dassana Dec 3, 2020
ab99758
enhance #162 - Table: Auto hide/show pagination based on row count (#…
sam-dassana Dec 3, 2020
9254d2f
Merge branch 'master' into dev
parth-dassana Dec 3, 2020
31f1a62
feat #166 - Form Updates (#167)
nancy-dassana Dec 7, 2020
638c166
Merge branch 'master' into dev
Dec 7, 2020
bc6527c
Update package.json
Dec 7, 2020
b7b4524
fix #169 - Add toggle focus styles (#170)
sam-dassana Dec 8, 2020
d25ea1e
Merge branch 'master' into dev
Dec 8, 2020
c52d2d5
feat #171 - Table skeleton loader, fix #173 - Overwrite antd Table st…
sam-dassana Dec 11, 2020
c405303
feat #174 - NotificationV2 updates, chore #175 - Extract out IconButt…
sam-dassana Dec 14, 2020
6d97974
chore #179 - Modal and Wizard components (#180)
nancy-dassana Jan 6, 2021
89384c8
Merge branch 'master' into dev
Jan 6, 2021
31afbf2
feat #178 - Comps related to filter (#182)
sam-dassana Jan 14, 2021
9971301
Merge branch 'master' into dev
Jan 14, 2021
f6a3be7
Fix #187 - Multiselect bug (container always wraps) (#188)
sam-dassana Jan 19, 2021
d589ca1
feat #184 - Table enhancements (#189)
nancy-dassana Jan 19, 2021
6324400
feat #190 - Accordion Component (#191)
nancy-dassana Jan 20, 2021
cd5bf48
fix #192 - Fix form async initialValues (#193)
nancy-dassana Jan 20, 2021
c559bf6
Merge branch 'master' into dev
Jan 20, 2021
abeee74
feat #195 - Chip input component (#196)
sam-dassana Jan 22, 2021
d1f0d7b
Merge branch 'master' into dev
Jan 25, 2021
961946c
fix #198 - typescript bug with ChipInput component (#199)
sam-dassana Jan 25, 2021
7bdb4c2
Merge branch 'master' into dev
Jan 25, 2021
85a1f22
feat #186 - MultipleChoice component, Refac ShortcutMicrocopy (#201)
sam-dassana Jan 29, 2021
7375ce8
Merge branch 'master' into dev
Jan 31, 2021
65e6676
feat #205, fix #206 - IconButton and Popover enhancements (#207)
nancy-dassana Feb 3, 2021
702be86
feat #202 - Time input components (#203)
sam-dassana Feb 3, 2021
2be3bf2
Merge branch 'master' into dev
Feb 5, 2021
4bcec12
chore #209 - Add org manager icon (#210)
nancy-dassana Feb 6, 2021
64d6f5c
Merge branch 'master' into dev
Feb 6, 2021
7cb8410
Update package.json
Feb 6, 2021
0d7187c
Updates related to onboarding (#212)
sam-dassana Feb 8, 2021
fbc7ec7
Merge branch 'master' into dev
parth-dassana Feb 9, 2021
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
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dassana-io/web-components",
"version": "0.8.8",
"version": "0.8.9",
"publishConfig": {
"registry": "https://npm.pkg.github.com/dassana-io"
},
Expand Down
31 changes: 24 additions & 7 deletions src/components/Form/FormSubmitButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,25 @@ import { useFormContext } from 'react-hook-form'
import { useShortcut } from '@dassana-io/web-utils'
import { Button, ButtonProps } from 'components/Button'
import React, { FC, useContext } from 'react'
import {
ShortcutMicrocopy,
ShortcutMicrocopyProps
} from 'components/ShortcutMicrocopy'

export interface FormButtonProps
extends Omit<ButtonProps, 'loading' | 'onClick'> {
isDisabled?: (
formState: FormStateProxy,
formValues: Record<string, any>
) => boolean
renderShortcutMicrocopy?: boolean
shortcutMicrocopyProps?: ShortcutMicrocopyProps
}

const FormSubmitButton: FC<FormButtonProps> = ({
isDisabled,
renderShortcutMicrocopy = false,
shortcutMicrocopyProps,
...rest
}: FormButtonProps) => {
const { handleSubmit, formState, watch } = useFormContext()
Expand All @@ -24,6 +32,7 @@ const FormSubmitButton: FC<FormButtonProps> = ({
const isButtonDisabled = () =>
isDisabled ? isDisabled(formState, watch()) : !isDirty

/* TODO: Refactor to allow for multiple keys */
useShortcut({
additionalConditionalFn: () => !isButtonDisabled(),
callback: handleSubmit(onSubmit),
Expand All @@ -32,13 +41,21 @@ const FormSubmitButton: FC<FormButtonProps> = ({
})

return (
<Button
dataTag='submit-button'
disabled={isButtonDisabled()}
loading={loading}
onClick={handleSubmit(onSubmit)}
{...rest}
/>
<>
<Button
dataTag='submit-button'
disabled={isButtonDisabled()}
loading={loading}
onClick={handleSubmit(onSubmit)}
{...rest}
/>
{renderShortcutMicrocopy && !isButtonDisabled() && (
<ShortcutMicrocopy
{...shortcutMicrocopyProps}
loading={loading}
/>
)}
</>
)
}

Expand Down
3 changes: 3 additions & 0 deletions src/components/Form/FormTimeInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ export interface FormTimeInputProps
extends BaseFieldProps,
Omit<TimeInputProps, 'defaultValue' | 'onChange' | 'value'> {
focused?: boolean
fullWidth?: boolean
}

const FormTimeInput: FC<FormTimeInputProps> = ({
label,
labelSkeletonWidth,
focused,
fullWidth,
name,
required,
rules = {},
Expand All @@ -34,6 +36,7 @@ const FormTimeInput: FC<FormTimeInputProps> = ({
<div>
{label && (
<FieldLabel
fullWidth={fullWidth}
label={label}
loading={loading}
required={required}
Expand Down