diff --git a/AppBar/src/AppBar.csproj b/AppBar/src/AppBar.csproj index 297e2a6..7e8c2da 100644 --- a/AppBar/src/AppBar.csproj +++ b/AppBar/src/AppBar.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/AppBar/src/Provider/AppBarStyleProvider.cs b/AppBar/src/Provider/AppBarStyleProvider.cs index 1db2915..93a9235 100644 --- a/AppBar/src/Provider/AppBarStyleProvider.cs +++ b/AppBar/src/Provider/AppBarStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.AppBar { public class AppBarStyleProvider : StyleTypeProvider { - public AppBarStyleProvider() : base(typeof(AppBarStyle)) + public AppBarStyleProvider() : base(priority: 280, typeof(AppBarStyle)) { } } diff --git a/Avatar/src/Avatar.csproj b/Avatar/src/Avatar.csproj index 298398f..475e5a7 100644 --- a/Avatar/src/Avatar.csproj +++ b/Avatar/src/Avatar.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Avatar/src/Provider/AvatarStyleProvider.cs b/Avatar/src/Provider/AvatarStyleProvider.cs index 190fc00..4462775 100644 --- a/Avatar/src/Provider/AvatarStyleProvider.cs +++ b/Avatar/src/Provider/AvatarStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Avatar { public class AvatarStyleProvider : StyleTypeProvider { - public AvatarStyleProvider() : base(typeof(AvatarStyle)) + public AvatarStyleProvider() : base(priority: 60, typeof(AvatarStyle)) { } } diff --git a/Badge/src/Badge.csproj b/Badge/src/Badge.csproj index a60823c..9014b44 100644 --- a/Badge/src/Badge.csproj +++ b/Badge/src/Badge.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Badge/src/Provider/BadgeStyleProvider.cs b/Badge/src/Provider/BadgeStyleProvider.cs index 201d568..097e58f 100644 --- a/Badge/src/Provider/BadgeStyleProvider.cs +++ b/Badge/src/Provider/BadgeStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Badge { public class BadgeStyleProvider : StyleTypeProvider { - public BadgeStyleProvider() : base(typeof(BadgeStyle)) + public BadgeStyleProvider() : base(priority: 50, typeof(BadgeStyle)) { } } diff --git a/Baseline/src/Baseline.csproj b/Baseline/src/Baseline.csproj index 40691ab..970b5c1 100644 --- a/Baseline/src/Baseline.csproj +++ b/Baseline/src/Baseline.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Baseline/src/Provider/BaselineStyleProvider.cs b/Baseline/src/Provider/BaselineStyleProvider.cs index 94f572b..9f2a03e 100644 --- a/Baseline/src/Provider/BaselineStyleProvider.cs +++ b/Baseline/src/Provider/BaselineStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Baseline { public class BaselineStyleProvider : StyleTypeProvider { - public BaselineStyleProvider() : base(typeof(BaselineStyle)) + public BaselineStyleProvider() : base(priority: 10, typeof(BaselineStyle)) { } } diff --git a/Button/src/Button.csproj b/Button/src/Button.csproj index 94ea8c0..7cef5a4 100644 --- a/Button/src/Button.csproj +++ b/Button/src/Button.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Button/src/Provider/ButtonStyleProvider.cs b/Button/src/Provider/ButtonStyleProvider.cs index e718330..cd11f6e 100644 --- a/Button/src/Provider/ButtonStyleProvider.cs +++ b/Button/src/Provider/ButtonStyleProvider.cs @@ -6,6 +6,7 @@ public class ButtonStyleProvider : StyleTypeProvider { public ButtonStyleProvider() : base ( + priority: 140, typeof(ButtonBaseStyle), typeof(FabStyle), typeof(IconButtonStyle), diff --git a/Card/src/Card.csproj b/Card/src/Card.csproj index d775774..e30f8cf 100644 --- a/Card/src/Card.csproj +++ b/Card/src/Card.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Card/src/Provider/CardStyleProvider.cs b/Card/src/Provider/CardStyleProvider.cs index a89aa2c..62489b3 100644 --- a/Card/src/Provider/CardStyleProvider.cs +++ b/Card/src/Provider/CardStyleProvider.cs @@ -6,6 +6,7 @@ public class CardStyleProvider : StyleTypeProvider { public CardStyleProvider() : base ( + priority: 150, typeof(CardStyle), typeof(CardContentStyle), typeof(CardHeaderStyle), diff --git a/Chip/src/Chip.csproj b/Chip/src/Chip.csproj index 17826bd..953fa9b 100644 --- a/Chip/src/Chip.csproj +++ b/Chip/src/Chip.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 @@ -17,11 +17,11 @@ - + diff --git a/Chip/src/Provider/ChipStyleProvider.cs b/Chip/src/Provider/ChipStyleProvider.cs index 0d90aa6..775f562 100644 --- a/Chip/src/Provider/ChipStyleProvider.cs +++ b/Chip/src/Provider/ChipStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Chip { public class ChipStyleProvider : StyleTypeProvider { - public ChipStyleProvider() : base(typeof(ChipStyle)) + public ChipStyleProvider() : base(priority: 120, typeof(ChipStyle)) { } } diff --git a/Container/src/Container.csproj b/Container/src/Container.csproj index 4ac3e3d..3b632b4 100644 --- a/Container/src/Container.csproj +++ b/Container/src/Container.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Container/src/Provider/ContainerStyleProvider.cs b/Container/src/Provider/ContainerStyleProvider.cs index b5edd46..772d1ba 100644 --- a/Container/src/Provider/ContainerStyleProvider.cs +++ b/Container/src/Provider/ContainerStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Container { public class ContainerStyleProvider : StyleTypeProvider { - public ContainerStyleProvider() : base(typeof(ContainerStyle)) + public ContainerStyleProvider() : base(priority: 20, typeof(ContainerStyle)) { } } diff --git a/Core/src/Core.csproj b/Core/src/Core.csproj index 5ac2c48..7989a08 100644 --- a/Core/src/Core.csproj +++ b/Core/src/Core.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 @@ -17,10 +17,10 @@ - + diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index ad2a49f..b1ef44f 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -5,8 +5,8 @@ 1 - Core 2 - Script (DomHelpers) 2 - Theme - 3 - Responsive (just for consitent) 3 - Baseline + 3 - Responsive (just for consitent) 3 - Container 3 - Divider 3 - Grid @@ -59,3 +59,35 @@ 5 - Popover 6 - Menu + +Priority: + +Baseline: 10 +Container: 20 +Grid: 30 +Divider: 40 +Badge: 50 +Avatar: 60 +Paper: 70 +Icon: 80 +Form: 90 +Toolbar: 100 +Typography: 110 +Chip: 120 +Transition: 130 +Button: 140 +Card: 150 +Progress: 160 +Selection: 170 +Tab: 180 +Table: 190 +Link: 200 +Modal: 210 +Dialog: 220 +Drawer: 230 +List: 240 +Popover: 250 +Menu: 260 +Input: 270 +AppBar: 280 +Hidden: 1000 \ No newline at end of file diff --git a/Dialog/src/Dialog.csproj b/Dialog/src/Dialog.csproj index ea57a14..6580fc5 100644 --- a/Dialog/src/Dialog.csproj +++ b/Dialog/src/Dialog.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Dialog/src/Provider/DialogStyleProvider.cs b/Dialog/src/Provider/DialogStyleProvider.cs index cbf0f4c..fe160a7 100644 --- a/Dialog/src/Provider/DialogStyleProvider.cs +++ b/Dialog/src/Provider/DialogStyleProvider.cs @@ -6,6 +6,7 @@ public class DialogStyleProvider : StyleTypeProvider { public DialogStyleProvider() : base ( + priority: 220, typeof(DialogStyle), typeof(DialogActionsStyle), typeof(DialogContentStyle), diff --git a/Divider/src/Divider.csproj b/Divider/src/Divider.csproj index 69d7d72..e6c80f8 100644 --- a/Divider/src/Divider.csproj +++ b/Divider/src/Divider.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Divider/src/Provider/DividerStyleProvider.cs b/Divider/src/Provider/DividerStyleProvider.cs index c55ec68..e183930 100644 --- a/Divider/src/Provider/DividerStyleProvider.cs +++ b/Divider/src/Provider/DividerStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Divider { public class DividerStyleProvider : StyleTypeProvider { - public DividerStyleProvider() : base(typeof(DividerStyle)) + public DividerStyleProvider() : base(priority: 40, typeof(DividerStyle)) { } } diff --git a/Drawer/src/Drawer.csproj b/Drawer/src/Drawer.csproj index 4158f0e..33c2f79 100644 --- a/Drawer/src/Drawer.csproj +++ b/Drawer/src/Drawer.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Drawer/src/Provider/DrawerStyleProvider.cs b/Drawer/src/Provider/DrawerStyleProvider.cs index 53b3316..a6cc072 100644 --- a/Drawer/src/Provider/DrawerStyleProvider.cs +++ b/Drawer/src/Provider/DrawerStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Drawer { public class DrawerStyleProvider : StyleTypeProvider { - public DrawerStyleProvider() : base(typeof(DrawerStyle)) + public DrawerStyleProvider() : base(priority: 230, typeof(DrawerStyle)) { } } diff --git a/Form/src/Form.csproj b/Form/src/Form.csproj index b38dd23..0c20ab2 100644 --- a/Form/src/Form.csproj +++ b/Form/src/Form.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Form/src/Provider/FormStyleProvider.cs b/Form/src/Provider/FormStyleProvider.cs index 7f230cd..f152ab2 100644 --- a/Form/src/Provider/FormStyleProvider.cs +++ b/Form/src/Provider/FormStyleProvider.cs @@ -6,6 +6,7 @@ public class FormStyleProvider : StyleTypeProvider { public FormStyleProvider() : base ( + priority: 90, typeof(FormControlStyle), typeof(FormControlLabelStyle), typeof(FormGroupStyle), diff --git a/Grid/src/Grid.csproj b/Grid/src/Grid.csproj index 9c273b1..c51a6fb 100644 --- a/Grid/src/Grid.csproj +++ b/Grid/src/Grid.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Grid/src/Provider/GridStyleProvider.cs b/Grid/src/Provider/GridStyleProvider.cs index b2fe985..874a00b 100644 --- a/Grid/src/Provider/GridStyleProvider.cs +++ b/Grid/src/Provider/GridStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Grid { public class GridStyleProvider : StyleTypeProvider { - public GridStyleProvider() : base(typeof(GridStyle)) + public GridStyleProvider() : base(priority: 30, typeof(GridStyle)) { } } diff --git a/Hidden/src/Hidden.csproj b/Hidden/src/Hidden.csproj index 00d0ef4..7114af5 100644 --- a/Hidden/src/Hidden.csproj +++ b/Hidden/src/Hidden.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Hidden/src/Provider/HiddenStyleProvider.cs b/Hidden/src/Provider/HiddenStyleProvider.cs index 8eab606..87de08d 100644 --- a/Hidden/src/Provider/HiddenStyleProvider.cs +++ b/Hidden/src/Provider/HiddenStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Hidden { public class HiddenStyleProvider : StyleTypeProvider { - public HiddenStyleProvider() : base(typeof(HiddenStyle)) + public HiddenStyleProvider() : base(priority: 1000, typeof(HiddenStyle)) { } } diff --git a/Icon/src/Icon.csproj b/Icon/src/Icon.csproj index 0822695..4f9f081 100644 --- a/Icon/src/Icon.csproj +++ b/Icon/src/Icon.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Icon/src/Provider/IconStyleProvider.cs b/Icon/src/Provider/IconStyleProvider.cs index 0b0d534..a625e38 100644 --- a/Icon/src/Provider/IconStyleProvider.cs +++ b/Icon/src/Provider/IconStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Icon { public class IconStyleProvider : StyleTypeProvider { - public IconStyleProvider() : base(typeof(SvgIconStyle)) + public IconStyleProvider() : base(priority: 80, typeof(SvgIconStyle)) { } } diff --git a/Input/src/FilledInput/FilledInput.razor b/Input/src/FilledInput/FilledInput.razor index 55869cf..b4edf70 100644 --- a/Input/src/FilledInput/FilledInput.razor +++ b/Input/src/FilledInput/FilledInput.razor @@ -11,6 +11,8 @@ Disabled="@Disabled" AutoComplete="@AutoComplete" AutoFocus="@AutoFocus" + AutoCorrect="@AutoCorrect" + AutoCapitalize="@AutoCapitalize" DefaultValue="@DefaultValue" FullWidth="@FullWidth" InputComponent="@Component" diff --git a/Input/src/FilledInput/FilledInput.razor.cs b/Input/src/FilledInput/FilledInput.razor.cs index 3c4d7ad..346a6da 100644 --- a/Input/src/FilledInput/FilledInput.razor.cs +++ b/Input/src/FilledInput/FilledInput.razor.cs @@ -32,6 +32,18 @@ public FilledInput() : base("FilledInput") [Parameter] public bool AutoFocus { set; get; } + /// + /// safari `AutoCorrect` for this component. + /// + [Parameter] + public bool AutoCorrect { set; get; } + + /// + /// safari `AutoCapitalize` for this component. + /// + [Parameter] + public bool AutoCapitalize { set; get; } + /// /// The default input element value. Use when the component is not controlled. /// diff --git a/Input/src/Input.csproj b/Input/src/Input.csproj index cd5fcba..115f19d 100644 --- a/Input/src/Input.csproj +++ b/Input/src/Input.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 @@ -17,11 +17,11 @@ - + diff --git a/Input/src/Input/Input.razor b/Input/src/Input/Input.razor index 1b55fa1..0c1ab74 100644 --- a/Input/src/Input/Input.razor +++ b/Input/src/Input/Input.razor @@ -12,6 +12,8 @@ Disabled="@_Disabled" AutoComplete="@AutoComplete" AutoFocus="@AutoFocus" + AutoCorrect="@AutoCorrect" + AutoCapitalize="@AutoCapitalize" DefaultValue="@DefaultValue" FullWidth="@FullWidth" InputComponent="@Component" diff --git a/Input/src/Input/Input.razor.cs b/Input/src/Input/Input.razor.cs index fff221b..c1c4138 100644 --- a/Input/src/Input/Input.razor.cs +++ b/Input/src/Input/Input.razor.cs @@ -32,6 +32,18 @@ public Input() : base("Input") [Parameter] public bool AutoFocus { set; get; } + /// + /// safari `AutoCorrect` for this component. + /// + [Parameter] + public bool AutoCorrect { set; get; } + + /// + /// safari `AutoCapitalize` for this component. + /// + [Parameter] + public bool AutoCapitalize { set; get; } + /// /// The default input element value. Use when the component is not controlled. /// diff --git a/Input/src/InputBase/InputBase.razor b/Input/src/InputBase/InputBase.razor index 6f33a43..e4b2376 100644 --- a/Input/src/InputBase/InputBase.razor +++ b/Input/src/InputBase/InputBase.razor @@ -20,6 +20,8 @@ disabled="@Disabled" autofocus="@AutoFocus" autocomplete="@AutoComplete" + autocorrect="@_AutoCorrect" + autocapitalize="@_AutoCapitalize" placeholder="@PlaceHolder" readonly="@ReadOnly" required="@Required" diff --git a/Input/src/InputBase/InputBase.razor.cs b/Input/src/InputBase/InputBase.razor.cs index 45f9fc8..8be618b 100644 --- a/Input/src/InputBase/InputBase.razor.cs +++ b/Input/src/InputBase/InputBase.razor.cs @@ -44,6 +44,18 @@ public InputBase() : base("InputBase") [Parameter] public bool AutoFocus { set; get; } + /// + /// safari `AutoCorrect` for this component. + /// + [Parameter] + public bool AutoCorrect { set; get; } + + /// + /// safari `AutoCapitalize` for this component. + /// + [Parameter] + public bool AutoCapitalize { set; get; } + /// /// The default input element value. Use when the component is not controlled. /// @@ -173,6 +185,10 @@ public InputBase() : base("InputBase") protected string _Input => InputComponent ?? (Multiline ? "textarea" : "input"); + protected string _AutoCorrect => AutoCorrect ? "on" : "off"; + + protected string _AutoCapitalize => AutoCapitalize ? "on" : "off"; + protected bool IsControlled => OnChange.HasDelegate || ValueChanged.HasDelegate; protected string ValueState { set; get; } diff --git a/Input/src/OutlinedInput/OutlinedInput.razor b/Input/src/OutlinedInput/OutlinedInput.razor index 89a27af..8856614 100644 --- a/Input/src/OutlinedInput/OutlinedInput.razor +++ b/Input/src/OutlinedInput/OutlinedInput.razor @@ -12,6 +12,8 @@ Disabled="@Disabled" AutoComplete="@AutoComplete" AutoFocus="@AutoFocus" + AutoCorrect="@AutoCorrect" + AutoCapitalize="@AutoCapitalize" DefaultValue="@DefaultValue" FullWidth="@FullWidth" InputComponent="@Component" diff --git a/Input/src/OutlinedInput/OutlinedInput.razor.cs b/Input/src/OutlinedInput/OutlinedInput.razor.cs index 786f9b2..ec3d98f 100644 --- a/Input/src/OutlinedInput/OutlinedInput.razor.cs +++ b/Input/src/OutlinedInput/OutlinedInput.razor.cs @@ -47,6 +47,18 @@ public OutlinedInput() : base("OutlinedInput") [Parameter] public bool AutoFocus { set; get; } + /// + /// safari `AutoCorrect` for this component. + /// + [Parameter] + public bool AutoCorrect { set; get; } + + /// + /// safari `AutoCapitalize` for this component. + /// + [Parameter] + public bool AutoCapitalize { set; get; } + /// /// The default input element value. Use when the component is not controlled. /// diff --git a/Input/src/Provider/InputStyleProvider.cs b/Input/src/Provider/InputStyleProvider.cs index 70acd72..c456f55 100644 --- a/Input/src/Provider/InputStyleProvider.cs +++ b/Input/src/Provider/InputStyleProvider.cs @@ -6,6 +6,7 @@ public class InputStyleProvider : StyleTypeProvider { public InputStyleProvider() : base ( + priority: 270, typeof(InputAdornmentStyle), typeof(InputLabelStyle), typeof(InputBaseStyle), diff --git a/Link/src/Link.csproj b/Link/src/Link.csproj index ab73c00..9596d9d 100644 --- a/Link/src/Link.csproj +++ b/Link/src/Link.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Link/src/Provider/LinkStyleProvider.cs b/Link/src/Provider/LinkStyleProvider.cs index 902b3ce..8eddeb7 100644 --- a/Link/src/Provider/LinkStyleProvider.cs +++ b/Link/src/Provider/LinkStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Link { public class LinkStyleProvider : StyleTypeProvider { - public LinkStyleProvider() : base(typeof(LinkStyle)) + public LinkStyleProvider() : base(priority: 200, typeof(LinkStyle)) { } } diff --git a/List/src/List.csproj b/List/src/List.csproj index d0f1f04..d53c549 100644 --- a/List/src/List.csproj +++ b/List/src/List.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/List/src/Provider/ListStyleProvider.cs b/List/src/Provider/ListStyleProvider.cs index fc0152a..89c3ba3 100644 --- a/List/src/Provider/ListStyleProvider.cs +++ b/List/src/Provider/ListStyleProvider.cs @@ -6,6 +6,7 @@ public class ListStyleProvider : StyleTypeProvider { public ListStyleProvider() : base ( + priority: 240, typeof(ListStyle), typeof(ListItemStyle), typeof(ListItemAvatarStyle), diff --git a/Material/src/Extension/MaterialExtension.cs b/Material/src/Extension/MaterialExtension.cs index e0a2fad..e746cd0 100644 --- a/Material/src/Extension/MaterialExtension.cs +++ b/Material/src/Extension/MaterialExtension.cs @@ -29,8 +29,8 @@ public static class MaterialExtension { public static void TryAddMaterialServices(this IServiceCollection services, IMaterialConfig config) { - services.TryAddResponsiveServices(config); services.TryAddBaselineServices(config); + services.TryAddResponsiveServices(config); services.TryAddContainerServices(config); services.TryAddGridServices(config); services.TryAddDividerServices(config); diff --git a/Material/src/Material.csproj b/Material/src/Material.csproj index 038f6e8..ef42b4f 100644 --- a/Material/src/Material.csproj +++ b/Material/src/Material.csproj @@ -1,7 +1,7 @@ - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Menu/src/Menu.csproj b/Menu/src/Menu.csproj index b9076d6..41c3ae1 100644 --- a/Menu/src/Menu.csproj +++ b/Menu/src/Menu.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Menu/src/MenuListHelper/MenuListHelper.cs b/Menu/src/MenuListHelper/MenuListHelper.cs index 9d9c83e..21e1ccf 100644 --- a/Menu/src/MenuListHelper/MenuListHelper.cs +++ b/Menu/src/MenuListHelper/MenuListHelper.cs @@ -6,6 +6,9 @@ namespace Skclusive.Material.Menu { public class MenuListHelper : IAsyncDisposable + #if NETSTANDARD2_0 + , IDisposable + #endif { public MenuListHelper(IScriptService scriptService) { @@ -28,5 +31,17 @@ public async ValueTask DisposeAsync() await ScriptService.InvokeVoidAsync("Skclusive.Material.Menu.MenuListHelper.construct", Id); } } + +#if NETSTANDARD2_0 + + void IDisposable.Dispose() + { + if (this is IAsyncDisposable disposable) + { + _ = disposable.DisposeAsync(); + } + } + +#endif } } \ No newline at end of file diff --git a/Menu/src/Provider/MenuScriptProvider.cs b/Menu/src/Provider/MenuScriptProvider.cs index d56e435..c5a82cb 100644 --- a/Menu/src/Provider/MenuScriptProvider.cs +++ b/Menu/src/Provider/MenuScriptProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Menu { public class MenuScriptProvider : ScriptTypeProvider { - public MenuScriptProvider() : base(typeof(MenuScript)) + public MenuScriptProvider() : base(priority: 260, typeof(MenuScript)) { } } diff --git a/Menu/src/Provider/MenuStyleProvider.cs b/Menu/src/Provider/MenuStyleProvider.cs index b043a63..bfb1f5a 100644 --- a/Menu/src/Provider/MenuStyleProvider.cs +++ b/Menu/src/Provider/MenuStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Menu { public class MenuStyleProvider : StyleTypeProvider { - public MenuStyleProvider() : base(typeof(MenuStyle), typeof(MenuItemStyle)) + public MenuStyleProvider() : base(priority: 260, typeof(MenuStyle), typeof(MenuItemStyle)) { } } diff --git a/Modal/src/Modal.csproj b/Modal/src/Modal.csproj index a10e4a7..92b66be 100644 --- a/Modal/src/Modal.csproj +++ b/Modal/src/Modal.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Modal/src/Provider/ModalScriptProvider.cs b/Modal/src/Provider/ModalScriptProvider.cs index 13bf173..05941c7 100644 --- a/Modal/src/Provider/ModalScriptProvider.cs +++ b/Modal/src/Provider/ModalScriptProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Modal { public class ModalScriptProvider : ScriptTypeProvider { - public ModalScriptProvider() : base(typeof(ModalScript)) + public ModalScriptProvider() : base(priority: 210, typeof(ModalScript)) { } } diff --git a/Modal/src/Provider/ModalStyleProvider.cs b/Modal/src/Provider/ModalStyleProvider.cs index 0894e84..19fc840 100644 --- a/Modal/src/Provider/ModalStyleProvider.cs +++ b/Modal/src/Provider/ModalStyleProvider.cs @@ -6,6 +6,7 @@ public class ModalStyleProvider : StyleTypeProvider { public ModalStyleProvider() : base ( + priority: 210, typeof(BackdropStyle), typeof(SimpleBackdropStyle) ) diff --git a/Modal/src/TrapFocusHelper/TrapFocusHelper.cs b/Modal/src/TrapFocusHelper/TrapFocusHelper.cs index d08791a..f3d4911 100644 --- a/Modal/src/TrapFocusHelper/TrapFocusHelper.cs +++ b/Modal/src/TrapFocusHelper/TrapFocusHelper.cs @@ -6,6 +6,9 @@ namespace Skclusive.Material.Modal { public class TrapFocusHelper : IAsyncDisposable + #if NETSTANDARD2_0 + , IDisposable + #endif { public TrapFocusHelper(IScriptService scriptService) { @@ -30,5 +33,17 @@ public async ValueTask DisposeAsync() await ScriptService.InvokeVoidAsync("Skclusive.Material.Modal.TrapFocusHelper.dispose", Id); } } + +#if NETSTANDARD2_0 + + void IDisposable.Dispose() + { + if (this is IAsyncDisposable disposable) + { + _ = disposable.DisposeAsync(); + } + } + +#endif } } \ No newline at end of file diff --git a/Paper/src/Paper.csproj b/Paper/src/Paper.csproj index ca8f293..f33201b 100644 --- a/Paper/src/Paper.csproj +++ b/Paper/src/Paper.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Paper/src/Provider/PaperStyleProvider.cs b/Paper/src/Provider/PaperStyleProvider.cs index d22d5c3..0f3afe7 100644 --- a/Paper/src/Provider/PaperStyleProvider.cs +++ b/Paper/src/Provider/PaperStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Paper { public class PaperStyleProvider : StyleTypeProvider { - public PaperStyleProvider() : base(typeof(PaperStyle)) + public PaperStyleProvider() : base(priority: 70, typeof(PaperStyle)) { } } diff --git a/Popover/src/Popover.csproj b/Popover/src/Popover.csproj index 57bd04e..f7a3a46 100644 --- a/Popover/src/Popover.csproj +++ b/Popover/src/Popover.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Popover/src/PopoverHelper/PopoverHelper.cs b/Popover/src/PopoverHelper/PopoverHelper.cs index 53868c6..4dd813b 100644 --- a/Popover/src/PopoverHelper/PopoverHelper.cs +++ b/Popover/src/PopoverHelper/PopoverHelper.cs @@ -8,6 +8,9 @@ namespace Skclusive.Material.Popover { public class PopoverHelper : IAsyncDisposable + #if NETSTANDARD2_0 + , IDisposable + #endif { public PopoverHelper(IScriptService scriptService, DomHelpers domHelpers) { @@ -57,5 +60,17 @@ public ValueTask DisposeAsync() { return default; } + +#if NETSTANDARD2_0 + + void IDisposable.Dispose() + { + if (this is IAsyncDisposable disposable) + { + _ = disposable.DisposeAsync(); + } + } + +#endif } } \ No newline at end of file diff --git a/Popover/src/Provider/PopoverScriptProvider.cs b/Popover/src/Provider/PopoverScriptProvider.cs index 58168e5..3c7c876 100644 --- a/Popover/src/Provider/PopoverScriptProvider.cs +++ b/Popover/src/Provider/PopoverScriptProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Popover { public class PopoverScriptProvider : ScriptTypeProvider { - public PopoverScriptProvider() : base(typeof(PopoverScript)) + public PopoverScriptProvider() : base(priority: 250, typeof(PopoverScript)) { } } diff --git a/Popover/src/Provider/PopoverStyleProvider.cs b/Popover/src/Provider/PopoverStyleProvider.cs index ea0432e..3258bdd 100644 --- a/Popover/src/Provider/PopoverStyleProvider.cs +++ b/Popover/src/Provider/PopoverStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Popover { public class PopoverStyleProvider : StyleTypeProvider { - public PopoverStyleProvider() : base(typeof(PopoverStyle)) + public PopoverStyleProvider() : base(priority: 250, typeof(PopoverStyle)) { } } diff --git a/Progress/src/Progress.csproj b/Progress/src/Progress.csproj index ef6e808..6e51733 100644 --- a/Progress/src/Progress.csproj +++ b/Progress/src/Progress.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Progress/src/Provider/ProgressStyleProvider.cs b/Progress/src/Provider/ProgressStyleProvider.cs index ede1e2b..4dcaf78 100644 --- a/Progress/src/Provider/ProgressStyleProvider.cs +++ b/Progress/src/Provider/ProgressStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Progress { public class ProgressStyleProvider : StyleTypeProvider { - public ProgressStyleProvider() : base(typeof(CircularProgressStyle), typeof(LinearProgressStyle)) + public ProgressStyleProvider() : base(priority: 160, typeof(CircularProgressStyle), typeof(LinearProgressStyle)) { } } diff --git a/Responsive/src/Responsive.csproj b/Responsive/src/Responsive.csproj index 0dd20aa..4e1f27b 100644 --- a/Responsive/src/Responsive.csproj +++ b/Responsive/src/Responsive.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Selection/src/Extension/SelectionExtension.cs b/Selection/src/Extension/SelectionExtension.cs index bc59e08..eaa2377 100644 --- a/Selection/src/Extension/SelectionExtension.cs +++ b/Selection/src/Extension/SelectionExtension.cs @@ -15,10 +15,10 @@ public static void TryAddSelectionServices(this IServiceCollection services, IMa { services.TryAddIconServices(config); - services.TryAddFormServices(config); - services.TryAddButtonServices(config); + services.TryAddFormServices(config); + services.TryAddTransient(); services.TryAddStyleTypeProvider(); diff --git a/Selection/src/Provider/SelectionScriptProvider.cs b/Selection/src/Provider/SelectionScriptProvider.cs index 6aa6fa6..2bf6911 100644 --- a/Selection/src/Provider/SelectionScriptProvider.cs +++ b/Selection/src/Provider/SelectionScriptProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Selection { public class SelectionScriptProvider : ScriptTypeProvider { - public SelectionScriptProvider() : base(typeof(SelectionScript)) + public SelectionScriptProvider() : base(priority: 170, typeof(SelectionScript)) { } } diff --git a/Selection/src/Provider/SelectionStyleProvider.cs b/Selection/src/Provider/SelectionStyleProvider.cs index 626b1e5..0ddb89e 100644 --- a/Selection/src/Provider/SelectionStyleProvider.cs +++ b/Selection/src/Provider/SelectionStyleProvider.cs @@ -6,6 +6,7 @@ public class SelectionStyleProvider : StyleTypeProvider { public SelectionStyleProvider() : base ( + priority: 170, typeof(SwitchBaseStyle), typeof(SwitchStyle), typeof(CheckboxStyle), diff --git a/Selection/src/RadioGroupHelper/RadioGroupHelper.cs b/Selection/src/RadioGroupHelper/RadioGroupHelper.cs index b11af90..aa611cd 100644 --- a/Selection/src/RadioGroupHelper/RadioGroupHelper.cs +++ b/Selection/src/RadioGroupHelper/RadioGroupHelper.cs @@ -6,6 +6,9 @@ namespace Skclusive.Material.Selection { public class RadioGroupHelper : IAsyncDisposable + #if NETSTANDARD2_0 + , IDisposable + #endif { public RadioGroupHelper(IScriptService scriptService) { @@ -26,5 +29,17 @@ public ValueTask DisposeAsync() { return default; } + +#if NETSTANDARD2_0 + + void IDisposable.Dispose() + { + if (this is IAsyncDisposable disposable) + { + _ = disposable.DisposeAsync(); + } + } + +#endif } } \ No newline at end of file diff --git a/Selection/src/Selection.csproj b/Selection/src/Selection.csproj index 7eadca0..3854cd5 100644 --- a/Selection/src/Selection.csproj +++ b/Selection/src/Selection.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Tab/src/Provider/TabStyleProvider.cs b/Tab/src/Provider/TabStyleProvider.cs index b5c3ab7..cd96226 100644 --- a/Tab/src/Provider/TabStyleProvider.cs +++ b/Tab/src/Provider/TabStyleProvider.cs @@ -6,6 +6,7 @@ public class TabStyleProvider : StyleTypeProvider { public TabStyleProvider() : base ( + priority: 170, typeof(TabIndicatorStyle), typeof(TabScrollButtonStyle), typeof(TabStyle), diff --git a/Tab/src/Tab.csproj b/Tab/src/Tab.csproj index 5332263..8997732 100644 --- a/Tab/src/Tab.csproj +++ b/Tab/src/Tab.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Table/src/Provider/TabStyleProvider.cs b/Table/src/Provider/TabStyleProvider.cs index 690c731..943557d 100644 --- a/Table/src/Provider/TabStyleProvider.cs +++ b/Table/src/Provider/TabStyleProvider.cs @@ -6,6 +6,7 @@ public class TableStyleProvider : StyleTypeProvider { public TableStyleProvider() : base ( + priority: 190, typeof(TableStyle), typeof(TableBodyStyle), typeof(TableCellStyle), diff --git a/Table/src/Table.csproj b/Table/src/Table.csproj index 9911182..ab8942a 100644 --- a/Table/src/Table.csproj +++ b/Table/src/Table.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Text/src/Text.csproj b/Text/src/Text.csproj index 475ed84..1811ef8 100644 --- a/Text/src/Text.csproj +++ b/Text/src/Text.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Theme/src/Theme.csproj b/Theme/src/Theme.csproj index ec32357..d6ac44c 100644 --- a/Theme/src/Theme.csproj +++ b/Theme/src/Theme.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 @@ -17,11 +17,11 @@ - + diff --git a/Toolbar/src/Provider/ToolbarStyleProvider.cs b/Toolbar/src/Provider/ToolbarStyleProvider.cs index 6fe9bc3..bc1c425 100644 --- a/Toolbar/src/Provider/ToolbarStyleProvider.cs +++ b/Toolbar/src/Provider/ToolbarStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Toolbar { public class ToolbarStyleProvider : StyleTypeProvider { - public ToolbarStyleProvider() : base(typeof(ToolbarStyle)) + public ToolbarStyleProvider() : base(priority: 100, typeof(ToolbarStyle)) { } } diff --git a/Toolbar/src/Toolbar.csproj b/Toolbar/src/Toolbar.csproj index bb30db2..709d49f 100644 --- a/Toolbar/src/Toolbar.csproj +++ b/Toolbar/src/Toolbar.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 diff --git a/Transition/src/Provider/TransitionScriptProvider.cs b/Transition/src/Provider/TransitionScriptProvider.cs index 6931d94..706bcec 100644 --- a/Transition/src/Provider/TransitionScriptProvider.cs +++ b/Transition/src/Provider/TransitionScriptProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Transition { public class TransitionScriptProvider : ScriptTypeProvider { - public TransitionScriptProvider() : base(typeof(TransitionScript)) + public TransitionScriptProvider() : base(priority: 130, typeof(TransitionScript)) { } } diff --git a/Transition/src/Provider/TransitionStyleProvider.cs b/Transition/src/Provider/TransitionStyleProvider.cs index 6696273..fde022f 100644 --- a/Transition/src/Provider/TransitionStyleProvider.cs +++ b/Transition/src/Provider/TransitionStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Transition { public class TransitionStyleProvider : StyleTypeProvider { - public TransitionStyleProvider() : base(typeof(CollapseContainerStyle)) + public TransitionStyleProvider() : base(priority: 130, typeof(CollapseContainerStyle)) { } } diff --git a/Transition/src/Transition.csproj b/Transition/src/Transition.csproj index 0a665bc..7e74df5 100644 --- a/Transition/src/Transition.csproj +++ b/Transition/src/Transition.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0 @@ -17,11 +17,11 @@ - + diff --git a/Typography/src/Provider/TypographyStyleProvider.cs b/Typography/src/Provider/TypographyStyleProvider.cs index c7f9fc7..4b6d142 100644 --- a/Typography/src/Provider/TypographyStyleProvider.cs +++ b/Typography/src/Provider/TypographyStyleProvider.cs @@ -4,7 +4,7 @@ namespace Skclusive.Material.Typography { public class TypographyStyleProvider : StyleTypeProvider { - public TypographyStyleProvider() : base(typeof(TypographyStyle)) + public TypographyStyleProvider() : base(priority: 110, typeof(TypographyStyle)) { } } diff --git a/Typography/src/Typography.csproj b/Typography/src/Typography.csproj index ebdeb08..b16626f 100644 --- a/Typography/src/Typography.csproj +++ b/Typography/src/Typography.csproj @@ -1,7 +1,7 @@  - 5.1.2 + 5.2.0 $(VersionSuffix) netstandard2.0;net5.0 3.0