Skip to content

Commit d5ce2ac

Browse files
authored
[refactor] Progress Bar, Modal & Dialog components (#23)
1 parent 18ef29d commit d5ce2ac

30 files changed

+273
-260
lines changed

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "boot-cell",
3-
"version": "2.0.0-beta.23",
3+
"version": "2.0.0-beta.26",
44
"license": "LGPL-3.0",
55
"author": "[email protected]",
66
"description": "Web Components UI library based on WebCell v3, BootStrap v5, BootStrap Icon v1 & FontAwesome v6",
@@ -27,9 +27,9 @@
2727
"@swc/helpers": "^0.5.11",
2828
"classnames": "^2.5.1",
2929
"dom-renderer": "^2.1.7",
30-
"mobx": "^6.12.3",
30+
"mobx": "^6.12.4",
3131
"regenerator-runtime": "^0.14.1",
32-
"web-cell": "^3.0.0-rc.15",
32+
"web-cell": "^3.0.0-rc.16",
3333
"web-utility": "^4.4.0"
3434
},
3535
"peerDependencies": {
@@ -49,7 +49,6 @@
4949
"@parcel/transformer-typescript-types": "~2.12.0",
5050
"@peculiar/webcrypto": "^1.5.0",
5151
"@tech_query/snabbdom-looks-like": "^2.0.1",
52-
"@types/classnames": "^2.3.1",
5352
"@types/jest": "^29.5.12",
5453
"@types/resize-observer-browser": "^0.1.11",
5554
"@types/turndown": "^5.0.4",
@@ -60,7 +59,7 @@
6059
"iterable-observer": "^1.0.1",
6160
"jest": "^29.7.0",
6261
"less": "^4.2.0",
63-
"lint-staged": "^15.2.6",
62+
"lint-staged": "^15.2.7",
6463
"markdown-area-element": "^0.2.3",
6564
"open-cli": "^8.0.0",
6665
"parcel": "~2.12.0",

pnpm-lock.yaml

Lines changed: 16 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/Button.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import { FC, WebCellProps } from 'web-cell';
44

55
import { FormControlProps } from './Form';
66
import { Icon, IconProps } from './Reminder';
7-
import { Color } from './type';
7+
import { TextColor } from './type';
88

99
export interface ButtonProps
1010
extends WebCellProps<HTMLButtonElement>,
1111
Omit<WebCellProps<HTMLAnchorElement>, 'type'>,
1212
Pick<FormControlProps<'input'>, 'size'> {
13-
variant?: Color | `outline-${Color}` | 'link';
13+
variant?: TextColor | `outline-${TextColor}` | 'link';
1414
active?: boolean;
1515
}
1616

source/Carousel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export class Carousel extends HTMLElement implements WebCell<CarouselProps> {
178178
<>
179179
<link
180180
rel="stylesheet"
181-
href="https://unpkg.com/[email protected].2/dist/css/bootstrap.min.css"
181+
href="https://unpkg.com/[email protected].3/dist/css/bootstrap.min.css"
182182
/>
183183
{this.renderContent()}
184184
</>

source/Card.tsx renamed to source/Content/Card.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import classNames from 'classnames';
22
import { FC, WebCellProps } from 'web-cell';
33

4-
import { Image, ImageProps } from './Image';
5-
import { Color, PositionY } from './type';
4+
import { Image, ImageProps } from '../Image';
5+
import { TextColor, PositionY } from '../type';
66

77
export interface CardProps extends WebCellProps<HTMLDivElement> {
8-
bg?: Color;
9-
text?: Color | 'white' | 'muted';
10-
border?: Color;
8+
bg?: TextColor;
9+
text?: TextColor | 'white' | 'muted';
10+
border?: TextColor;
1111
body?: boolean;
1212
}
1313

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import classNames from 'classnames';
22
import { JsxChildren } from 'dom-renderer';
33
import { FC } from 'web-cell';
44

5-
import { BackgroundColor } from './type';
6-
import { Container, ContainerProps } from './Grid';
5+
import { BackgroundColor } from '../type';
6+
import { Container, ContainerProps } from '../Grid';
77

88
export interface JumbotronProps
99
extends Omit<ContainerProps, 'title'>,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const MediaObject: FC<MediaObjectProps> = ({
1717
image,
1818
imageRow = 'start',
1919
imageColumn = 'start',
20-
defaultSlot,
20+
children,
2121
...rest
2222
}) => {
2323
const start = imageColumn === 'start';
@@ -39,7 +39,7 @@ export const MediaObject: FC<MediaObjectProps> = ({
3939
</div>
4040
<div className={`flex-grow-1 ${start ? 'ms-3' : 'me-3'}`}>
4141
<h5 className="mt-0">{title}</h5>
42-
{defaultSlot}
42+
{children}
4343
</div>
4444
</>
4545
);

0 commit comments

Comments
 (0)