diff --git a/lib/package.json b/lib/package.json index e54fdad60..cad941197 100644 --- a/lib/package.json +++ b/lib/package.json @@ -1,6 +1,6 @@ { "name": "dooboo-ui", - "version": "0.0.21", + "version": "0.0.22", "main": "index.js", "types": "index.d.ts", "author": "dooboolab", diff --git a/main/Checkbox/Checkbox.tsx b/main/Checkbox/Checkbox.tsx index 7850993de..a9ffb3395 100644 --- a/main/Checkbox/Checkbox.tsx +++ b/main/Checkbox/Checkbox.tsx @@ -6,6 +6,7 @@ import React, { useRef, useState, } from 'react'; + import { GroupCheckboxContext } from './CheckboxGroup'; import { TouchableHighlight } from 'react-native'; import styled from 'styled-components/native'; @@ -35,7 +36,7 @@ export interface CheckboxProps { customStyle?: CustomStyle; } -const Checkbox: FC = ({ +export const Checkbox: FC = ({ label, value, checked = false, @@ -188,5 +189,3 @@ const Label = styled.Text` padding-right: ${({ labelLeft }): number => (labelLeft ? 10 : 0)}px; color: ${({ labelColor }): string => labelColor || COLOR.BLACK}; `; - -export default Checkbox; diff --git a/main/Checkbox/CheckboxGroup.tsx b/main/Checkbox/CheckboxGroup.tsx index 47ef51d17..b87d2e744 100644 --- a/main/Checkbox/CheckboxGroup.tsx +++ b/main/Checkbox/CheckboxGroup.tsx @@ -1,5 +1,6 @@ import React, { FC, useCallback, useEffect, useRef, useState } from 'react'; -import Checkbox from './Checkbox'; + +import { Checkbox } from './Checkbox'; import styled from 'styled-components/native'; interface CustomStyle { @@ -48,7 +49,7 @@ interface CheckboxGroupProps { export const GroupCheckboxContext = React.createContext(null); -const CheckboxGroup: FC = ({ +export const CheckboxGroup: FC = ({ defaultValues, values, options, @@ -157,5 +158,3 @@ const Container = styled.View` flex-wrap: wrap; align-items: flex-start; `; - -export default CheckboxGroup; diff --git a/main/Checkbox/index.tsx b/main/Checkbox/index.tsx index 4670774be..84ac72d95 100644 --- a/main/Checkbox/index.tsx +++ b/main/Checkbox/index.tsx @@ -1,2 +1,2 @@ -export { default as Checkbox } from './Checkbox'; -export { default as CheckboxGroup } from './CheckboxGroup'; +export { Checkbox } from './Checkbox'; +export { CheckboxGroup } from './CheckboxGroup'; diff --git a/packages/Tables/__assets__/mark.png b/main/__assets__/mark.png similarity index 100% rename from packages/Tables/__assets__/mark.png rename to main/__assets__/mark.png diff --git a/main/index.ts b/main/index.ts index 3da602ca0..0a793c6be 100644 --- a/main/index.ts +++ b/main/index.ts @@ -12,5 +12,3 @@ export { SwitchToggle } from './SwitchToggle'; export { Select, SelectItem } from './Select'; export { Checkbox, CheckboxGroup } from './Checkbox'; export { Card } from './Card'; -export { PinchZoom } from './PinchZoom'; -export { DatePicker } from './DatePicker'; diff --git a/package.json b/package.json index 6d975662d..84250f689 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "react-docgen-typescript-loader": "^3.7.2", "react-dom": "16.13.1", "react-native": "https://github.com/expo/react-native/archive/sdk-39.0.0.tar.gz", + "react-native-get-random-values": "^1.5.0", "react-native-svg": "^12.1.0", "react-native-web": "^0.13.14", "react-test-renderer": "^16.13.1", diff --git a/main/DatePicker/Calendar/Calendar.tsx b/packages/DatePicker/Calendar/Calendar.tsx similarity index 100% rename from main/DatePicker/Calendar/Calendar.tsx rename to packages/DatePicker/Calendar/Calendar.tsx diff --git a/main/DatePicker/Calendar/CalendarDate.tsx b/packages/DatePicker/Calendar/CalendarDate.tsx similarity index 100% rename from main/DatePicker/Calendar/CalendarDate.tsx rename to packages/DatePicker/Calendar/CalendarDate.tsx diff --git a/main/DatePicker/Calendar/CalendarMonth.tsx b/packages/DatePicker/Calendar/CalendarMonth.tsx similarity index 100% rename from main/DatePicker/Calendar/CalendarMonth.tsx rename to packages/DatePicker/Calendar/CalendarMonth.tsx diff --git a/main/DatePicker/Calendar/CalendarWeekDays.tsx b/packages/DatePicker/Calendar/CalendarWeekDays.tsx similarity index 100% rename from main/DatePicker/Calendar/CalendarWeekDays.tsx rename to packages/DatePicker/Calendar/CalendarWeekDays.tsx diff --git a/main/DatePicker/DateInput.tsx b/packages/DatePicker/DateInput.tsx similarity index 98% rename from main/DatePicker/DateInput.tsx rename to packages/DatePicker/DateInput.tsx index ba6c01f9c..7675ac9a1 100644 --- a/main/DatePicker/DateInput.tsx +++ b/packages/DatePicker/DateInput.tsx @@ -6,6 +6,7 @@ import { ViewStyle, } from 'react-native'; import React, { FC, useEffect, useState } from 'react'; + import styled from 'styled-components/native'; const Container = styled.View` @@ -139,7 +140,7 @@ const DateInput: FC = (props) => { diff --git a/main/DatePicker/PickerCalendar.tsx b/packages/DatePicker/PickerCalendar.tsx similarity index 100% rename from main/DatePicker/PickerCalendar.tsx rename to packages/DatePicker/PickerCalendar.tsx diff --git a/main/DatePicker/README.md b/packages/DatePicker/README.md similarity index 100% rename from main/DatePicker/README.md rename to packages/DatePicker/README.md diff --git a/main/__assets__/calendar.png b/packages/DatePicker/assets/calendar.png similarity index 100% rename from main/__assets__/calendar.png rename to packages/DatePicker/assets/calendar.png diff --git a/main/DatePicker/index.tsx b/packages/DatePicker/index.tsx similarity index 100% rename from main/DatePicker/index.tsx rename to packages/DatePicker/index.tsx diff --git a/main/PinchZoom/PinchZoom.example.tsx b/packages/PinchZoom/PinchZoom.example.tsx similarity index 100% rename from main/PinchZoom/PinchZoom.example.tsx rename to packages/PinchZoom/PinchZoom.example.tsx diff --git a/main/PinchZoom/README.md b/packages/PinchZoom/README.md similarity index 100% rename from main/PinchZoom/README.md rename to packages/PinchZoom/README.md diff --git a/main/PinchZoom/index.tsx b/packages/PinchZoom/index.tsx similarity index 100% rename from main/PinchZoom/index.tsx rename to packages/PinchZoom/index.tsx diff --git a/main/PinchZoom/utils.ts b/packages/PinchZoom/utils.ts similarity index 100% rename from main/PinchZoom/utils.ts rename to packages/PinchZoom/utils.ts diff --git a/packages/Tables/CheckBox.tsx b/packages/Tables/CheckBox.tsx index f6d81754e..0649dbabe 100644 --- a/packages/Tables/CheckBox.tsx +++ b/packages/Tables/CheckBox.tsx @@ -1,6 +1,6 @@ import React, { ReactElement } from 'react'; -import { TouchableOpacity } from 'react-native'; +import { TouchableOpacity } from 'react-native'; import styled from 'styled-components/native'; const CheckView = styled.View<{ checked: boolean }>` @@ -31,7 +31,7 @@ function CheckBox(props: Props): ReactElement { return ( - + ); diff --git a/packages/Tables/assets/mark.png b/packages/Tables/assets/mark.png new file mode 100644 index 000000000..64c6d122d Binary files /dev/null and b/packages/Tables/assets/mark.png differ diff --git a/main/__tests__/DatePicker.test.tsx b/packages/__tests__/DatePicker.test.tsx similarity index 85% rename from main/__tests__/DatePicker.test.tsx rename to packages/__tests__/DatePicker.test.tsx index efb97ab1a..44e984739 100644 --- a/main/__tests__/DatePicker.test.tsx +++ b/packages/__tests__/DatePicker.test.tsx @@ -20,10 +20,9 @@ const standardDate = new Date('2020-09-13'); describe('[DatePicker] render', () => { it('should render without crashing', () => { - const rendered = render().toJSON(); + const rendered = render(); - expect(rendered).toMatchSnapshot(); - expect(rendered).toBeTruthy(); + expect(rendered.toJSON()).toMatchSnapshot(); }); }); @@ -31,10 +30,9 @@ describe('[DateInput] render', () => { it('should render without crashing', () => { const rendered = render( { }} selectedDate={standardDate} />, - ).toJSON(); + ); - expect(rendered).toMatchSnapshot(); - expect(rendered).toBeTruthy(); + expect(rendered.toJSON()).toMatchSnapshot(); }); describe('[DateInput] Interaction', () => { @@ -73,10 +71,9 @@ describe('[PickerCalendar] render', () => { selectedDate={standardDate} locale={'en-US'} weekdayFormat={'narrow'} />, - ).toJSON(); + ); - expect(rendered).toMatchSnapshot(); - expect(rendered).toBeTruthy(); + expect(rendered.toJSON()).toMatchSnapshot(); }); }); @@ -89,10 +86,9 @@ describe('[Calendar]', () => { calendarWidth={300} locale={'en-US'} />, - ).toJSON(); + ); - expect(rendered).toMatchSnapshot(); - expect(rendered).toBeTruthy(); + expect(rendered.toJSON()).toMatchSnapshot(); }); }); @@ -100,10 +96,9 @@ describe('[CalendarDate] render', () => { it('should render without crashing', () => { const rendered = render( { }} date={standardDate} isToday={false} />, - ).toJSON(); + ); - expect(rendered).toMatchSnapshot(); - expect(rendered).toBeTruthy(); + expect(rendered.toJSON()).toMatchSnapshot(); }); describe('[CalendarDate] Interaction', () => { @@ -142,10 +137,9 @@ describe('[CalendarMonth] render', () => { renderDay={(): React.ReactElement => } today={standardDate} />, - ).toJSON(); + ); - expect(rendered).toMatchSnapshot(); - expect(rendered).toBeTruthy(); + expect(rendered.toJSON()).toMatchSnapshot(); }); }); @@ -153,9 +147,8 @@ describe('[CalendarWeekDays] render', () => { it('should render without crashing', () => { const rendered = render( , - ).toJSON(); + ); - expect(rendered).toMatchSnapshot(); - expect(rendered).toBeTruthy(); + expect(rendered.toJSON()).toMatchSnapshot(); }); }); diff --git a/main/__tests__/PinchZoom.test.tsx b/packages/__tests__/PinchZoom.test.tsx similarity index 100% rename from main/__tests__/PinchZoom.test.tsx rename to packages/__tests__/PinchZoom.test.tsx diff --git a/main/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/__tests__/__snapshots__/DatePicker.test.tsx.snap similarity index 99% rename from main/__tests__/__snapshots__/DatePicker.test.tsx.snap rename to packages/__tests__/__snapshots__/DatePicker.test.tsx.snap index e1244ba06..34c69d94c 100644 --- a/main/__tests__/__snapshots__/DatePicker.test.tsx.snap +++ b/packages/__tests__/__snapshots__/DatePicker.test.tsx.snap @@ -7287,7 +7287,7 @@ exports[`[DateInput] render should render without crashing 1`] = `