Skip to content
This repository was archived by the owner on Jul 28, 2024. It is now read-only.

Commit 6cb2433

Browse files
committed
fix update
1 parent 9c059b4 commit 6cb2433

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

src/woly/atoms/upload-area/index.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,11 @@ const UploadAreaBase: React.FC<UploadAreaProps & Priority> = ({
1414
center = false,
1515
className,
1616
content,
17-
<<<<<<< HEAD:src/woly/atoms/upload-area/index.tsx
18-
priority = 'default',
19-
}) => (
20-
<div className={className} data-priority={priority} tabIndex={0}>
21-
<div data-content data-center={center}>
22-
<div data-overlay />
23-
=======
2417
focus = false,
2518
priority = 'default',
2619
}) => (
2720
<div className={className} data-priority={priority} data-focus={focus}>
2821
<div data-content data-position-center={center}>
29-
>>>>>>> 76aab5df582124dcd900f1dcc7e9f44c2608dcff:src/upload/elements/upload-area/index.tsx
3022
{content}
3123
</div>
3224
<div data-overlay />

src/woly/organisms/select/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import styled, { StyledComponent } from 'styled-components';
33
import { ListContainer, ListItem, Surface } from 'ui/atoms';
4-
import { Popover } from 'ui';
4+
import { Popover } from 'ui/molecules';
55
import { Priority } from 'lib/types';
66
import { box } from 'ui/elements/box';
77
import { keyHandlerGet, keyboardEventHandle } from 'lib';

src/woly/organisms/select/usage.mdx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ If any initial value hasn`t been selected yet, you can pass a placeholder.
1616

1717
<Playground>
1818
<div style={{ height: '250px', width: '250px' }}>
19-
<StateEvent
20-
initial={null}
21-
change={(event) => event?.target?.textContent}
22-
>
19+
<StateEvent initial={null} change={(event) => event?.target?.textContent}>
2320
{(value, change) => (
2421
<Select
2522
icon={<IconArrowDown />}

0 commit comments

Comments
 (0)