Skip to content

Commit 08f7812

Browse files
committed
update package.json
1 parent b8c618b commit 08f7812

5 files changed

Lines changed: 149 additions & 227 deletions

File tree

Signum.React/Scripts/Components/Typeahead.tsx

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -276,25 +276,18 @@ interface CustomToggleProps {
276276
onClick?: (e: React.MouseEvent<any>) => void;
277277
}
278278

279-
class CustomToggle extends React.Component<CustomToggleProps> {
280-
constructor(props: CustomToggleProps, context: any) {
281-
super(props, context);
282-
}
283279

284-
handleClick = (e: React.MouseEvent<any>) => {
285-
e.preventDefault();
286-
this.props.onClick!(e);
287-
}
288-
289-
render() {
290-
return (
291-
<a href="" onClick={this.handleClick}>
292-
{this.props.children}
293-
</a>
294-
);
295-
}
296-
}
280+
const CustomToggle = React.forwardRef(function CustomToggle(p: { children: React.ReactNode, onClick: React.MouseEventHandler }, ref: React.Ref<HTMLAnchorElement>) {
297281

282+
return (
283+
<a
284+
ref={ref}
285+
href=""
286+
onClick={e => { e.preventDefault(); p.onClick(e); }}>
287+
{p.children}
288+
</a>
289+
);
290+
});
298291

299292
Typeahead.defaultProps = {
300293
getItems: undefined as any,

Signum.React/Scripts/Frames/ReactVisitor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class ReactVisitor {
3030

3131
const oldChildren = React.Children.toArray(element.props.children);
3232

33-
const newChildren = React.Children.map(oldChildren, c => this.visitChild(c));
33+
const newChildren = React.Children.map(oldChildren, c => this.visitChild(c as React.ReactChild));
3434

3535
if (newChildren.length != oldChildren.length || newChildren.some((n, i) => n !== oldChildren[i]))
3636
return React.cloneElement(element, undefined, newChildren);

Signum.React/Scripts/QuickLinks.tsx

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -174,29 +174,24 @@ export function QuickLinkWidget(p: QuickLinkWidgetProps) {
174174
}
175175

176176

177-
class QuickLinkToggle extends React.Component<{ onClick?: (e: React.MouseEvent<any>) => void, links: any[] | undefined }> {
177+
const QuickLinkToggle = React.forwardRef(function CustomToggle(p: { onClick: React.MouseEventHandler, links: any[] | undefined }, ref: React.Ref<HTMLAnchorElement>) {
178178

179-
handleClick = (e: React.MouseEvent<any>) => {
180-
e.preventDefault();
181-
this.props.onClick!(e);
182-
}
179+
const links = p.links;
183180

184-
render() {
185-
const links = this.props.links;
186-
return (
187-
<a
188-
className={classes("badge badge-pill", links?.some(l => !l.isShy) ? "badge-warning" : "badge-light", "sf-quicklinks")}
189-
title={StyleContext.default.titleLabels ? QuickLinkMessage.Quicklinks.niceToString() : undefined}
190-
role="button"
191-
href="#"
192-
data-toggle="dropdown"
193-
onClick={this.handleClick} >
194-
{links && <FontAwesomeIcon icon="star" />}
195-
{links ? "\u00A0" + links.length : "…"}
196-
</a>
197-
);
198-
}
199-
}
181+
return (
182+
<a
183+
ref={ref}
184+
className={classes("badge badge-pill", links?.some(l => !l.isShy) ? "badge-warning" : "badge-light", "sf-quicklinks")}
185+
title={StyleContext.default.titleLabels ? QuickLinkMessage.Quicklinks.niceToString() : undefined}
186+
role="button"
187+
href="#"
188+
data-toggle="dropdown"
189+
onClick={e => { e.preventDefault(); p.onClick(e); }}>
190+
{links && <FontAwesomeIcon icon="star" />}
191+
{links ? "\u00A0" + links.length : "…"}
192+
</a>
193+
);
194+
});
200195

201196
export interface QuickLinkOptions {
202197
isVisible?: boolean;

Signum.React/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
},
2222
"homepage": "https://github.com/signumsoftware/framework#readme",
2323
"dependencies": {
24-
"@fortawesome/fontawesome-svg-core": "1.2.25",
25-
"@fortawesome/free-brands-svg-icons": "5.11.2",
26-
"@fortawesome/free-regular-svg-icons": "5.11.2",
27-
"@fortawesome/free-solid-svg-icons": "5.11.2",
28-
"@fortawesome/react-fontawesome": "0.1.6",
24+
"@fortawesome/fontawesome-svg-core": "1.2.27",
25+
"@fortawesome/free-brands-svg-icons": "5.12.1",
26+
"@fortawesome/free-regular-svg-icons": "5.12.1",
27+
"@fortawesome/free-solid-svg-icons": "5.12.1",
28+
"@fortawesome/react-fontawesome": "0.1.8",
2929
"@types/d3": "5.7.2",
3030
"@types/d3-scale-chromatic": "1.3.1",
31-
"@types/history": "4.7.3",
31+
"@types/history": "4.7.5",
3232
"@types/prop-types": "15.7.3",
33-
"@types/react": "16.9.15",
34-
"@types/react-dom": "16.9.4",
35-
"@types/react-router": "5.1.2",
36-
"@types/react-router-dom": "5.1.1",
37-
"@types/react-transition-group": "4.2.3",
3833
"@types/react-widgets": "4.3.3",
34+
"@types/react": "16.9.23",
35+
"@types/react-dom": "16.9.5",
36+
"@types/react-router": "5.1.4",
37+
"@types/react-router-dom": "5.1.3",
38+
"@types/react-transition-group": "4.2.4",
3939
"@types/query-string": "5.1.0",
4040
"moment": "2.24.0",
4141
"numbro": "2.1.2",
4242
"popper.js": "1.15.0",
4343
"query-string": "5.1.1",
44-
"react": "16.11.0",
45-
"react-bootstrap": "1.0.0-beta.14",
46-
"react-dom": "16.11.0"
44+
"react": "16.12.0",
45+
"react-bootstrap": "1.0.0-beta.16",
46+
"react-dom": "16.12.0"
4747
}
4848
}

0 commit comments

Comments
 (0)