Skip to content

Commit

Permalink
Label and Button changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ianvexler committed Feb 14, 2024
1 parent 2ce10b1 commit 7babc42
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 33 deletions.
5 changes: 3 additions & 2 deletions dist/components/button/Button.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import React from 'react';
import { Themes } from 'types';
import { ButtonProps as BootstrapButtonProps } from 'react-bootstrap';
interface ButtonProps extends BootstrapButtonProps {
label: string;
label?: string;
icon?: string;
variant?: Themes;
}
declare const Button: ({ label, className, variant, ...rest }: ButtonProps) => React.JSX.Element;
declare const Button: ({ label, icon, children, className, variant, ...rest }: ButtonProps) => React.JSX.Element;
export default Button;
//# sourceMappingURL=Button.d.ts.map
2 changes: 1 addition & 1 deletion dist/components/button/Button.d.ts.map

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

2 changes: 1 addition & 1 deletion dist/components/chip/Chip.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ interface ChipProps extends React.HTMLProps<HTMLSpanElement> {
color: string;
label: string;
}
declare const Chip: ({ label, color, ...rest }: ChipProps) => React.JSX.Element;
declare const Chip: ({ style, label, color, ...rest }: ChipProps) => React.JSX.Element;
export default Chip;
//# sourceMappingURL=Chip.d.ts.map
2 changes: 1 addition & 1 deletion dist/components/chip/Chip.d.ts.map

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

4 changes: 2 additions & 2 deletions dist/components/form/Form.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export interface FormProps extends React.HTMLProps<HTMLFormElement> {
declare const Form: {
({ children, ...rest }: FormProps): React.JSX.Element;
Group: ({ label, className, children, ...rest }: import("./FormGroup").FormGroupProps) => React.JSX.Element;
Label: ({ label, className }: import("react-bootstrap").FormLabelProps & {
label: string;
Label: ({ label, children, className }: import("react-bootstrap").FormLabelProps & {
label?: string | undefined;
}) => React.JSX.Element;
Control: ({ className, ...rest }: import("./components/FormControl").FormControlProps) => React.JSX.Element;
Select: ({ className, children, ...rest }: import("./components/FormSelect").FormSelectProps) => React.JSX.Element;
Expand Down
4 changes: 2 additions & 2 deletions dist/components/form/components/FormLabel.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { FormLabelProps as BootstrapFormLabelProps } from 'react-bootstrap';
type FormLabelProps = BootstrapFormLabelProps & {
label: string;
label?: string;
};
declare const FormLabel: ({ label, className }: FormLabelProps) => React.JSX.Element;
declare const FormLabel: ({ label, children, className }: FormLabelProps) => React.JSX.Element;
export default FormLabel;
//# sourceMappingURL=FormLabel.d.ts.map
2 changes: 1 addition & 1 deletion dist/components/form/components/FormLabel.d.ts.map

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

2 changes: 1 addition & 1 deletion dist/index.es.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.es.js.map

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8482,8 +8482,11 @@ const Table$1 = /*#__PURE__*/React__namespace.forwardRef(({
var BootstrapTable = Table$1;

var Button = function (_a) {
var label = _a.label, className = _a.className, variant = _a.variant, rest = __rest(_a, ["label", "className", "variant"]);
return (React.createElement(Button$2, __assign$1({ className: className, variant: variant || 'primary' }, rest), label));
var label = _a.label, icon = _a.icon, children = _a.children, className = _a.className, variant = _a.variant, rest = __rest(_a, ["label", "icon", "children", "className", "variant"]);
return (React.createElement(Button$2, __assign$1({ className: className, variant: variant || 'primary' }, rest),
label || null,
icon ? React.createElement("i", { className: "bi bi-".concat(icon) }) : null,
children));
};

var TableSection;
Expand Down Expand Up @@ -8539,9 +8542,10 @@ var FormControl = function (_a) {
};

var FormLabel = function (_a) {
var label = _a.label, className = _a.className;
var label = _a.label, children = _a.children, className = _a.className;
return (React.createElement(BootstrapFormLabel, { className: className },
React.createElement("small", { className: "text-muted" }, label)));
label ? React.createElement("small", { className: "text-muted" }, label) : null,
children));
};

var FormGroup = function (_a) {
Expand Down Expand Up @@ -22861,14 +22865,9 @@ var Card = function (_a) {
};

var Chip = function (_a) {
var label = _a.label, color = _a.color, rest = __rest(_a, ["label", "color"]);
var style = _a.style, label = _a.label, color = _a.color, rest = __rest(_a, ["style", "label", "color"]);
return (React.createElement("h5", { className: "mb-0" },
React.createElement("span", __assign$1({ style: {
backgroundColor: color,
padding: '10px 15px',
fontSize: '16px',
borderRadius: '35px',
} }, rest), label)));
React.createElement("span", __assign$1({ style: __assign$1({ backgroundColor: color, padding: '10px 15px', fontSize: '16px', borderRadius: '35px' }, style) }, rest), label)));
};

var ListSection;
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/index.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.min.js.map

Large diffs are not rendered by default.

16 changes: 13 additions & 3 deletions src/components/button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,28 @@ import {
} from 'react-bootstrap';

interface ButtonProps extends BootstrapButtonProps {
label: string;
label?: string;
icon?: string;
variant?: Themes;
}

const Button = ({ label, className, variant, ...rest }: ButtonProps) => {
const Button = ({
label,
icon,
children,
className,
variant,
...rest
}: ButtonProps) => {
return (
<BootstrapButton
className={className}
variant={variant || 'primary'}
{...rest}
>
{label}
{label || null}
{icon ? <i className={`bi bi-${icon}`} /> : null}
{children}
</BootstrapButton>
);
};
Expand Down
7 changes: 4 additions & 3 deletions src/components/form/components/FormLabel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import {
} from 'react-bootstrap';

type FormLabelProps = BootstrapFormLabelProps & {
label: string;
label?: string;
};

const FormLabel = ({ label, className }: FormLabelProps) => {
const FormLabel = ({ label, children, className }: FormLabelProps) => {
return (
<BootstrapFormLabel className={className}>
<small className="text-muted">{label}</small>
{label ? <small className="text-muted">{label}</small> : null}
{children}
</BootstrapFormLabel>
);
};
Expand Down

0 comments on commit 7babc42

Please sign in to comment.