Skip to content

Commit bec6bdc

Browse files
authored
fix: conflicts between next and main v2 (#281)
1 parent 0a103ef commit bec6bdc

File tree

66 files changed

+1088
-292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1088
-292
lines changed

CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @nlopin @martimalek @div-Leo @rafael-sepeda @jonotrujillo
1+
* @nlopin @martimalek @div-Leo @jonotrujillo

docs/changelog.mdx

+20-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,26 @@ cardHeadline: Changelog
55
cardSubHeadline: Keep up to date with the latest releases of @freenow/wave
66
---
77

8-
## [2.1.0-next.1](https://github.com/freenowtech/wave/compare/v2.0.0...v2.1.0-next.1) (2021-10-14)
8+
## [1.27.0](https://github.com/freenowtech/wave/compare/v1.26.1...v1.27.0) (2022-08-19)
9+
10+
11+
### Features
12+
13+
* Tooltip with react-popper ([#267](https://github.com/freenowtech/wave/issues/267)) ([6965ef4](https://github.com/freenowtech/wave/commit/6965ef42b5f4257825b2fc86eeb1033eb4f06aa9))
14+
15+
### [1.25.3](https://github.com/freenowtech/wave/compare/v1.25.2...v1.25.3) (2022-07-21)
16+
17+
18+
### Bug Fixes
19+
20+
* expose padding prop and adjust z-index for Popover component ([#263](https://github.com/freenowtech/wave/issues/263)) ([da0e80b](https://github.com/freenowtech/wave/commit/da0e80be5df4274220336451641b31d1fe8d524f))
21+
22+
### [1.25.2](https://github.com/freenowtech/wave/compare/v1.25.1...v1.25.2) (2022-07-11)
23+
24+
25+
### Bug Fixes
26+
27+
* display semantic colors in table and allow to filter them ([#258](https://github.com/freenowtech/wave/issues/258)) ([2e83e76](https://github.com/freenowtech/wave/commit/2e83e763427fb5ce67fc99719a0a3a8837be086c))
928

1029
### [1.25.1](https://github.com/freenowtech/wave/compare/v1.25.0...v1.25.1) (2022-06-16)
1130

docs/contributing.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cardSubHeadline: Everyone is welcome to make contributions to the design system.
66
---
77

88
import workflowImageUrl from './contributing-new-pattern-workflow.svg'
9-
import { ImageModal } from './components/ImageModal.tsx';
9+
import { ImageModal } from './components/ImageModal';
1010

1111
## Reporting Bugs
1212

fixtures/typescript-build/src/index.tsx

+22
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
Logo,
2222
Modal,
2323
Pagination,
24+
PhoneInput,
2425
RadioButton,
2526
Select,
2627
TabBar,
@@ -439,6 +440,26 @@ const TestTooltip: React.FC = () => (
439440
</>
440441
);
441442

443+
const TestPhoneInput = () => (
444+
<>
445+
<PhoneInput />
446+
<PhoneInput id="hello" />
447+
<PhoneInput variant="boxed" size="medium" />
448+
<PhoneInput variant="bottom-lined" size="small" />
449+
<PhoneInput text="my text" />
450+
<PhoneInput
451+
inputProps={{
452+
onFocus: () => {}
453+
}}
454+
/>
455+
<PhoneInput
456+
selectListProps={{
457+
onFocus: () => {}
458+
}}
459+
/>
460+
</>
461+
);
462+
442463
const App: React.FC = () => (
443464
<>
444465
<TestBanner />
@@ -467,6 +488,7 @@ const App: React.FC = () => (
467488
<TestTextarea />
468489
<TestToggle />
469490
<TestTooltip />
491+
<TestPhoneInput />
470492
</>
471493
);
472494

package-lock.json

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@freenow/wave",
3-
"version": "2.1.0-next.1",
3+
"version": "1.27.0",
44
"description": "React components of the Wave design system for your Front-End project",
55
"main": "lib/cjs/index.js",
66
"typings": "lib/types/index.d.ts",

src/components/Accordion/docs/Accordion.mdx

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ route: /components/accordion
55
---
66

77
import { Playground } from 'docz';
8-
import { Box } from '../../Box/Box.tsx';
9-
import { Accordion } from '../Accordion.tsx';
10-
import { AccordionPropsTable } from './AccordionPropsTable.tsx';
11-
import { OnExpandExample } from './OnExpandExample.tsx';
8+
import { Box } from '../../Box/Box';
9+
import { Accordion } from '../Accordion';
10+
import { AccordionPropsTable } from './AccordionPropsTable';
11+
import { OnExpandExample } from './OnExpandExample';
1212

1313
# Accordion
1414
Accordion component is use to display large amount of content in a compress and progressive way.

src/components/Banner/docs/Banner.mdx

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ menu: Components
44
route: /components/banner
55
---
66

7-
import { Banner } from '../Banner.tsx';
7+
import { Banner } from '../Banner';
88
import { Text, Headline, Button } from '../..';
9-
import { BannerCreator } from './BannerCreator.tsx';
10-
import { BannerPropsTable } from './BannerPropsTable.tsx';
11-
import { ContainedBanner } from './ContainedBanner.ts';
9+
import { BannerCreator } from './BannerCreator';
10+
import { BannerPropsTable } from './BannerPropsTable';
11+
import { ContainedBanner } from './ContainedBanner';
1212

1313
# Banner
1414

src/components/Box/docs/Box.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ route: /components/box
55
---
66

77
import { Playground } from 'docz';
8-
import { Box } from '../Box.tsx';
8+
import { Box } from '../Box';
99
import { StyledSystemLinks } from '../../../docs/StyledSystemLinks'
1010

1111
# Box

src/components/Button/docs/Button.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { TextButton } from '../TextButton';
1010
import { Box } from '../../Box/Box';
1111
import { Headline } from '../../Headline/Headline';
1212
import { Text } from '../../Text/Text';
13-
import { TrashBinIcon, CloseIcon } from '../../../icons/index.ts';
14-
import { ButtonPropsTable } from './ButtonPropsTable.tsx';
13+
import { TrashBinIcon, CloseIcon } from '../../../icons/index';
14+
import { ButtonPropsTable } from './ButtonPropsTable';
1515
import { Combination } from '../../../docs/Combination'
1616
import { StyledSystemLinks } from '../../../docs/StyledSystemLinks'
1717

src/components/Card/docs/Card.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ route: /components/card
55
---
66

77
import { Playground } from 'docz';
8-
import { Card } from '../Card.tsx';
9-
import { Text } from '../../Text/Text.tsx';
8+
import { Card } from '../Card';
9+
import { Text } from '../../Text/Text';
1010
import { CardPropsTable } from './CardPropsTable'
1111
import { StyledSystemLinks } from '../../../docs/StyledSystemLinks'
1212
import { Combination } from '../../../docs/Combination'

src/components/Checkbox/docs/Checkbox.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ route: /components/Checkbox
66

77
import { Playground } from 'docz';
88
import { Checkbox } from '../Checkbox';
9-
import { CheckboxPropsTable } from './CheckboxPropsTable.tsx';
9+
import { CheckboxPropsTable } from './CheckboxPropsTable';
1010

1111
# Checkbox
1212

src/components/Datepicker/DatepickerRangeInput.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ interface DatepickerRangeInputProps extends MarginProps, WidthProps {
105105
*/
106106
label?: string;
107107
/**
108-
* Function that used when datepicker closes without selected date.
108+
* Function that is used when datepicker closes without selected date.
109109
*/
110110
onClose?: () => void;
111111
/**
112112
* Set the value for the date
113113
*/
114114
value?: DateRange;
115115
/**
116-
* Function that used when datepicker selects new date.
116+
* Function that is used when datepicker selects new date.
117117
*/
118118
onChange?: (change: DateRange) => void;
119119
/**

src/components/Datepicker/DatepickerSingleInput.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ interface DatepickerSingleInputProps extends MarginProps, WidthProps {
2323
*/
2424
label?: string;
2525
/**
26-
* Function that used when datepicker closes without selected date.
26+
* Function that is used when datepicker closes without selected date.
2727
*/
2828
onClose?: () => void;
2929
/**
30-
* Function that used when datepicker selects new date.
30+
* Function that is used when datepicker selects new date.
3131
*/
3232
onChange?: (date?: Date) => void;
3333
/**

src/components/Datepicker/docs/Datepicker.mdx

+9-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ route: /components/date-picker
55
---
66

77
import { Playground } from 'docz';
8+
import { StyledSystemLinks } from '../../../docs/StyledSystemLinks';
89
import { DatepickerRangeInput as DateRangePicker } from '../DatepickerRangeInput';
910
import { DatepickerSingleInput as DatePicker } from '../DatepickerSingleInput';
1011
import { ControlledDatepickerSingleInput } from './ControlledDatepickerSingleInput';
1112
import { ControlledDatepickerRangeInput } from './ControlledDatepickerRangeInput';
1213
import { DatepickerOnModal } from './DatepickerOnModal';
14+
import { DatepickerSingleInputPropsTable } from './DatepickerSingleInputPropsTable';
15+
import { DatepickerRangeInputPropsTable } from './DatepickerRangeInputPropsTable';
1316

1417
# Datepicker
1518

@@ -19,15 +22,19 @@ import { DatepickerOnModal } from './DatepickerOnModal';
1922

2023
### Single datepicker props
2124

22-
<Props of={DatePicker} />
25+
<DatepickerSingleInputPropsTable />
26+
<br />
27+
<StyledSystemLinks component="DatePicker" supportedProps={['margin', 'width']} />
2328

2429
## Range
2530

2631
<ControlledDatepickerRangeInput label="Date Range" />
2732

2833
### Range datepicker props
2934

30-
<Props of={DateRangePicker} />
35+
<DatepickerRangeInputPropsTable />
36+
<br />
37+
<StyledSystemLinks component="DateRangePicker" supportedProps={['margin', 'width']} />
3138

3239
## Datepicker on Modal
3340

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
import React, { FC } from 'react';
2+
3+
import { PropsTable } from '../../../docs/PropsTable';
4+
5+
export const DatepickerRangeInputPropsTable: FC = () => {
6+
const props = [
7+
{
8+
name: 'startPlaceholder',
9+
type: 'string',
10+
description: 'Placeholder for start date.'
11+
},
12+
{
13+
name: 'endPlaceholder',
14+
type: 'string',
15+
description: 'Placeholder for end date.'
16+
},
17+
{
18+
name: 'label',
19+
type: 'string',
20+
description: 'Label for the input.'
21+
},
22+
{
23+
name: 'onClose',
24+
type: 'Function => void',
25+
description: 'Function that is used when datepicker closes without selected date.'
26+
},
27+
{
28+
name: 'value',
29+
type: 'DateRange (interface containing startDate and endDate properties)',
30+
description: 'Set the value for the date.'
31+
},
32+
{
33+
name: 'onChange',
34+
type: 'Function (change: DateRange) => void',
35+
description: 'Function that is used when datepicker selects new date.'
36+
},
37+
{
38+
name: 'minDate',
39+
type: 'Date',
40+
description: 'Minimal date to select from.'
41+
},
42+
{
43+
name: 'maxDate',
44+
type: 'Date',
45+
description: 'Maximum date to select from.'
46+
},
47+
{
48+
name: 'firstDayOfWeek',
49+
type: 'FirstDayOfWeek (number from 0-6)',
50+
description: 'Accepts a number for first day of the week from 0 (Sunday) to 6 (Saturday).',
51+
defaultValue: '1'
52+
},
53+
{
54+
name: 'isDateBlocked',
55+
type: 'Function => boolean',
56+
description: 'Function that runs for each date and returns boolean whether date is disabled or not.',
57+
defaultValue: '() => false'
58+
},
59+
{
60+
name: 'placement',
61+
type: "'left' | 'right' | 'center'",
62+
description: 'Used to align the datepicker in relation to input.',
63+
defaultValue: 'left'
64+
},
65+
{
66+
name: 'displayFormat',
67+
type: 'string',
68+
description: 'String to format dates.',
69+
defaultValue: 'dd/MM/yyyy'
70+
},
71+
{
72+
name: 'locale',
73+
type: 'string',
74+
description: 'String to define the locale in ISO-639-1.',
75+
defaultValue: 'en-US'
76+
},
77+
{
78+
name: 'errorHandler',
79+
type: '(Function => void) | string',
80+
description: 'Text to be shown if error filling the input or fn to be trigger as a callback when error.'
81+
},
82+
{
83+
name: 'startInputId',
84+
type: 'string',
85+
description: 'The id to be assigned to the start date input.'
86+
},
87+
{
88+
name: 'endInputId',
89+
type: 'string',
90+
description: 'The id to be assigned to the end date input.'
91+
},
92+
{
93+
name: 'variant',
94+
type: "'compact' | 'normal'",
95+
description: "Determines the variant, 'compact' displays only a single month",
96+
defaultValue: "'normal'"
97+
},
98+
{
99+
name: 'disabled',
100+
type: 'boolean',
101+
description: 'Determines whether the datePicker is disabled or not.'
102+
}
103+
];
104+
return <PropsTable props={props} />;
105+
};

0 commit comments

Comments
 (0)