Skip to content

Commit f85f1d7

Browse files
committed
update to react-widgets 5.0 final and other minor upgrades
1 parent ba3aeed commit f85f1d7

14 files changed

Lines changed: 252 additions & 131 deletions

Signum.Entities/EnumMessages.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,6 @@ public enum JavascriptMessage
395395

396396
[Description("Date")]
397397
Date,
398-
[Description("Time")]
399-
Time,
400398
}
401399

402400
//https://github.com/jquense/react-widgets/blob/5d4985c6dac0df34b86c7d8ad311ff97066977ab/packages/react-widgets/src/messages.tsx#L35
@@ -412,14 +410,8 @@ public enum ReactWidgetsMessage
412410
MoveForward,
413411
[Description("Select date")]
414412
DateButton,
415-
[Description("Select time")]
416-
TimeButton,
417413
[Description("open combobox")]
418414
OpenCombobox,
419-
[Description("open dropdown")]
420-
OpenDropdown,
421-
[Description("")]
422-
Placeholder,
423415
[Description("")]
424416
FilterPlaceholder,
425417
[Description("There are no items in this list")]

Signum.React/Scripts/ConfigureReactWidgets.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
import * as React from 'react';
22
import { DateTime, Settings } from 'luxon';
33
import * as ReactWidgets from 'react-widgets';
4-
import { UserProvidedMessages } from 'react-widgets/lib/messages';
4+
import { UserProvidedMessages } from 'react-widgets/cjs/messages';
55
import { ReactWidgetsMessage } from './Signum.Entities';
6-
import { NumberLocalizer } from 'react-widgets/lib/IntlLocalizer';
6+
import { NumberLocalizer } from 'react-widgets/cjs/IntlLocalizer';
77

88
export function getMessages(): UserProvidedMessages{
99
return ({
1010
moveToday: ReactWidgetsMessage.MoveToday.niceToString(),
1111
moveBack: ReactWidgetsMessage.MoveBack.niceToString(),
1212
moveForward: ReactWidgetsMessage.MoveForward.niceToString(),
1313
dateButton: ReactWidgetsMessage.DateButton.niceToString(),
14-
timeButton: ReactWidgetsMessage.TimeButton.niceToString(),
1514
openCombobox: ReactWidgetsMessage.OpenCombobox.niceToString(),
16-
openDropdown: ReactWidgetsMessage.OpenDropdown.niceToString(),
17-
placeholder: ReactWidgetsMessage.Placeholder.niceToString(),
1815
emptyList: ReactWidgetsMessage.EmptyList.niceToString(),
1916
emptyFilter: ReactWidgetsMessage.EmptyFilter.niceToString(),
2017
createOption: (_value, searchTerm) =>

Signum.React/Scripts/Lines/EntityCombo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { FormControlReadonly } from './FormControlReadonly'
1010
import { classes } from '../Globals';
1111
import { useController } from './LineBase'
1212
import { useMounted } from '../Hooks'
13-
import { DropdownList } from 'react-widgets/lib'
13+
import { DropdownList } from 'react-widgets'
1414

1515

1616
export interface EntityComboProps extends EntityBaseProps {

Signum.React/Scripts/Lines/ValueLine.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import * as React from 'react'
22
import { DateTime, Duration, DurationObjectUnits } from 'luxon'
33
import { DateTimePicker, DatePicker, DropdownList } from 'react-widgets'
4-
import { CalendarProps } from 'react-widgets/lib/Calendar'
4+
import { CalendarProps } from 'react-widgets/cjs/Calendar'
55
import { Dic, addClass, classes } from '../Globals'
66
import { MemberInfo, getTypeInfo, TypeReference, toLuxonFormat, toDurationFormat, toNumberFormat, isTypeEnum, durationToString, TypeInfo, parseDuration } from '../Reflection'
77
import { LineBaseController, LineBaseProps, useController } from '../Lines/LineBase'
88
import { FormGroup } from '../Lines/FormGroup'
99
import { FormControlReadonly } from '../Lines/FormControlReadonly'
1010
import { BooleanEnum, JavascriptMessage } from '../Signum.Entities'
1111
import TextArea from '../Components/TextArea';
12-
import 'react-widgets/dist/css/react-widgets.css';
1312
import { KeyCodes } from '../Components/Basic';
1413
import { format } from 'd3';
1514
import { isPrefix, QueryToken } from '../FindOptions'
@@ -336,7 +335,8 @@ function internalComboBox(vl: ValueLineController) {
336335
<FormGroup ctx={s.ctx} labelText={s.labelText} helpText={s.helpText} htmlAttributes={{ ...vl.baseHtmlAttributes(), ...s.formGroupHtmlAttributes }} labelHtmlAttributes={s.labelHtmlAttributes}>
337336
{vl.withItemGroup(
338337
<DropdownList className={addClass(vl.props.valueHtmlAttributes, classes(s.ctx.formControlClass, vl.mandatoryClass))} data={optionItems} onChange={handleOptionItem} value={oi}
339-
filter="contains"
338+
filter={false}
339+
autoComplete="off"
340340
dataKey="value"
341341
textField="label"
342342
renderValue={a => vl.props.onRenderComboBoxItem!(a.item)}
@@ -698,7 +698,7 @@ ValueLineRenderers.renderers["DateTime" as ValueLineType] = (vl) => {
698698
valueDisplayFormat={luxonFormat}
699699
includeTime={showTime}
700700
inputProps={htmlAttributes as any} placeholder={htmlAttributes.placeholder}
701-
messages={{ dateButton: JavascriptMessage.Date.niceToString(), timeButton: JavascriptMessage.Time.niceToString() }}
701+
messages={{ dateButton: JavascriptMessage.Date.niceToString() }}
702702
min={s.minDate}
703703
max={s.maxDate}
704704
calendarProps={s.calendarProps}

Signum.React/Scripts/SearchControl/QueryTokenBuilder.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as React from 'react'
2-
import 'react-widgets/dist/css/react-widgets.css';
32
import { areEqual, classes } from '../Globals'
43
import * as Finder from '../Finder'
54
import { QueryToken, SubTokensOptions, getTokenParents, isPrefix } from '../FindOptions'

Signum.React/Scripts/SearchControl/SystemTimeEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export default class SystemTimeEditor extends React.Component<SystemTimeEditorPr
147147
return (
148148
<div className="rw-widget-sm ml-1" style={{ width: "230px" }}>
149149
<DateTimePicker value={m?.toJSDate()} onChange={handleDatePickerOnChange}
150-
valueEditFormat={luxonFormat} valueDisplayFormat={luxonFormat} includeTime={true} messages={{ dateButton: JavascriptMessage.Date.niceToString(), timeButton: JavascriptMessage.Time.niceToString() }} />
150+
valueEditFormat={luxonFormat} valueDisplayFormat={luxonFormat} includeTime={true} messages={{ dateButton: JavascriptMessage.Date.niceToString() }} />
151151
</div>
152152
);
153153
}

Signum.React/Scripts/Signum.Entities.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ export module JavascriptMessage {
340340
export const showPeriod = new MessageKey("JavascriptMessage", "showPeriod");
341341
export const showPreviousOperation = new MessageKey("JavascriptMessage", "showPreviousOperation");
342342
export const Date = new MessageKey("JavascriptMessage", "Date");
343-
export const Time = new MessageKey("JavascriptMessage", "Time");
344343
}
345344

346345
export module LiteMessage {
@@ -438,10 +437,7 @@ export module ReactWidgetsMessage {
438437
export const MoveBack = new MessageKey("ReactWidgetsMessage", "MoveBack");
439438
export const MoveForward = new MessageKey("ReactWidgetsMessage", "MoveForward");
440439
export const DateButton = new MessageKey("ReactWidgetsMessage", "DateButton");
441-
export const TimeButton = new MessageKey("ReactWidgetsMessage", "TimeButton");
442440
export const OpenCombobox = new MessageKey("ReactWidgetsMessage", "OpenCombobox");
443-
export const OpenDropdown = new MessageKey("ReactWidgetsMessage", "OpenDropdown");
444-
export const Placeholder = new MessageKey("ReactWidgetsMessage", "Placeholder");
445441
export const FilterPlaceholder = new MessageKey("ReactWidgetsMessage", "FilterPlaceholder");
446442
export const EmptyList = new MessageKey("ReactWidgetsMessage", "EmptyList");
447443
export const EmptyFilter = new MessageKey("ReactWidgetsMessage", "EmptyFilter");

Signum.React/Signum.React.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>net5.0</TargetFramework>
5-
<TypeScriptBuildMode>true</TypeScriptBuildMode>
65
<Nullable>enable</Nullable>
76
<WarningsAsErrors>nullable</WarningsAsErrors>
87
<OutputType>Library</OutputType>

Signum.React/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@
2121
},
2222
"homepage": "https://github.com/signumsoftware/framework#readme",
2323
"resolutions": {
24-
"@types/react": "17.0.0",
25-
"@types/history": "4.7.7"
24+
"@types/react": "17.0.3",
25+
"@types/history": "4.7.8"
2626
},
2727
"dependencies": {
28-
"@fortawesome/fontawesome-svg-core": "1.2.32",
28+
"@fortawesome/fontawesome-svg-core": "1.2.35",
2929
"@fortawesome/free-brands-svg-icons": "5.15.1",
30-
"@fortawesome/free-regular-svg-icons": "5.15.1",
31-
"@fortawesome/free-solid-svg-icons": "5.15.1",
32-
"@fortawesome/react-fontawesome": "0.1.13",
33-
"@types/d3": "6.2.0",
30+
"@fortawesome/free-regular-svg-icons": "5.15.3",
31+
"@fortawesome/free-solid-svg-icons": "5.15.3",
32+
"@fortawesome/react-fontawesome": "0.1.14",
33+
"@types/d3": "6.3.0",
3434
"@types/d3-scale-chromatic": "2.0.0",
3535
"@types/history": "4.7.8",
36-
"@types/luxon": "1.25.0",
36+
"@types/luxon": "1.26.2",
3737
"@types/prop-types": "15.7.3",
38-
"@types/react": "17.0.0",
39-
"@types/react-dom": "17.0.0",
40-
"@types/react-router": "5.1.8",
41-
"@types/react-router-dom": "5.1.6",
42-
"@types/react-transition-group": "4.4.0",
43-
"react-widgets": "5.0.0-beta.22",
38+
"@types/react": "17.0.3",
39+
"@types/react-dom": "17.0.3",
40+
"@types/react-router": "5.1.13",
41+
"@types/react-router-dom": "5.1.7",
42+
"@types/react-transition-group": "4.4.1",
43+
"react-widgets": "5.0.0",
4444
"luxon": "1.25.0",
4545
"popper.js": "1.16.1",
46-
"react": "17.0.1",
47-
"react-dom": "17.0.1",
48-
"react-bootstrap": "1.4.0"
46+
"react": "17.0.2",
47+
"react-dom": "17.0.2",
48+
"react-bootstrap": "1.5.2"
4949
}
5050
}

0 commit comments

Comments
 (0)