Skip to content

Commit

Permalink
Roll back styled components, see: styled-components/styled-components…
Browse files Browse the repository at this point in the history
  • Loading branch information
VPKSoft committed Jul 4, 2023
1 parent 4df230a commit 8bb6626
Show file tree
Hide file tree
Showing 20 changed files with 142 additions and 1,917 deletions.
2,012 changes: 118 additions & 1,894 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -28,7 +28,7 @@
"react-dom": "^18.2.0",
"react-i18next": "^13.0.1",
"react-secure-storage": "^1.2.2",
"styled-components": "^6.0.2",
"styled-components": "^5.3.11",
"typescript-eslint": "^0.0.1-alpha.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Expand Up @@ -30,7 +30,7 @@ import notify from "devextreme/ui/notify";
import { exit } from "@tauri-apps/api/process";
import { ask } from "@tauri-apps/api/dialog";
import dxTreeList, { Node } from "devextreme/ui/tree_list";
import { styled } from "styled-components";
import styled from "styled-components";
import { Locales, setLocale, useLocalize } from "./i18n";
import { DataEntry } from "./types/PasswordEntry";
import { DialogButtons, DialogResult, FileQueryMode, ModifyType, PopupType } from "./types/Enums";
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/AppMenu.tsx
Expand Up @@ -25,7 +25,7 @@ SOFTWARE.
import * as React from "react";
import Menu from "devextreme-react/menu";
import classNames from "classnames";
import { styled } from "styled-components";
import styled from "styled-components";
import { ItemClickEvent } from "devextreme/ui/menu";
import { useLocalize } from "../../i18n";
import { DataEntry } from "../../types/PasswordEntry";
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/AppMenuToolbar.tsx
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.

import * as React from "react";
import classNames from "classnames";
import { styled } from "styled-components";
import styled from "styled-components";
import { ItemClickEvent } from "devextreme/ui/menu";
import { AppToolbarProps, StyledAppToolbar } from "./AppToolbar";
import { AppMenuProps, MenuData, StyledAppMenu } from "./AppMenu";
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/AppToolbar.tsx
Expand Up @@ -25,7 +25,7 @@ SOFTWARE.
import * as React from "react";
import { Button, Toolbar } from "devextreme-react";
import { Item as ToolbarItem } from "devextreme-react/toolbar";
import { styled } from "styled-components";
import styled from "styled-components";
import classNames from "classnames";
import { DataEntry } from "../../types/PasswordEntry";
import { useLocalize } from "../../i18n";
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/WindowTitle.tsx
@@ -1,5 +1,5 @@
import * as React from "react";
import { styled } from "styled-components";
import styled from "styled-components";
import { appWindow } from "@tauri-apps/api/window";
import classNames from "classnames";
import { useLocalize } from "../../i18n";
Expand Down
2 changes: 1 addition & 1 deletion src/components/reusable/LockScreenOverlay.tsx
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.

import * as React from "react";
import classNames from "classnames";
import { styled } from "styled-components";
import styled from "styled-components";
import { CommonProps } from "../Types";

/**
Expand Down
11 changes: 6 additions & 5 deletions src/components/reusable/PasswordList.tsx
Expand Up @@ -5,7 +5,7 @@ import { Column, RowDragging, Selection } from "devextreme-react/tree-list";
import dxTreeList, { Node, RowDraggingChangeEvent, RowDraggingReorderEvent, SelectionChangedEvent, SavingEvent, InitializedEvent } from "devextreme/ui/tree_list";
import { Template } from "devextreme-react/core/template";
import classNames from "classnames";
import { styled } from "styled-components";
import styled from "styled-components";
import { useLocalize } from "../../i18n";
import { DataEntry } from "../../types/PasswordEntry";
import { CommonProps, DxFilter } from "../Types";
Expand Down Expand Up @@ -45,9 +45,9 @@ const PasswordList = ({

// Order the data by setting the SortOrder and ParentId properties.
const onReorder = React.useCallback(
(e: RowDraggingReorderEvent) => {
(e: unknown) => {
if (dataSource) {
setDataSource(reorderData(e, dataSource));
setDataSource(reorderData(e as RowDraggingReorderEvent, dataSource));
}
},
[dataSource, setDataSource]
Expand Down Expand Up @@ -165,7 +165,7 @@ const createFilterExpression = (value: SearchTextBoxValue) => {
}
result.pop();

return result.length === 0 ? undefined : result;
return result.length === 0 ? "" : (result as unknown as string);
};

/**
Expand Down Expand Up @@ -199,7 +199,8 @@ const isGroup = (entry: DataEntry) => {
* Validate the drag change of the {@link TreeList} for the {@link PasswordList} component.
* @param {RowDraggingChangeEvent} e The event data for the row dragging event.
*/
const onDragChange = (e: RowDraggingChangeEvent) => {
const onDragChange = (data: unknown) => {
const e = data as RowDraggingChangeEvent;
const visibleRows = e.component.getVisibleRows();

const sourceNode = visibleRows[e.fromIndex].node;
Expand Down
2 changes: 1 addition & 1 deletion src/components/reusable/inputs/PasswordTextBox.tsx
Expand Up @@ -27,7 +27,7 @@ import Button from "devextreme-react/button";
import TextBox from "devextreme-react/text-box";
import dxTextBox, { InitializedEvent, KeyDownEvent, ValueChangedEvent } from "devextreme/ui/text_box";
import * as React from "react";
import { styled } from "styled-components";
import styled from "styled-components";
import notify from "devextreme/ui/notify";
import { useLocalize } from "../../../i18n";
import { CommonProps } from "../../Types";
Expand Down
2 changes: 1 addition & 1 deletion src/components/reusable/inputs/SearchTextBox.tsx
Expand Up @@ -27,7 +27,7 @@ import Button from "devextreme-react/button";
import TextBox from "devextreme-react/text-box";
import dxTextBox, { InitializedEvent, KeyDownEvent, ValueChangedEvent } from "devextreme/ui/text_box";
import * as React from "react";
import { styled } from "styled-components";
import styled from "styled-components";
import { useLocalize } from "../../../i18n";
import { CommonProps } from "../../Types";

Expand Down
2 changes: 1 addition & 1 deletion src/components/software/EntryEditor.tsx
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.

import * as React from "react";
import classNames from "classnames";
import { styled } from "styled-components";
import styled from "styled-components";
import { TextArea, TextBox } from "devextreme-react";
import { ValueChangedEvent } from "devextreme/ui/text_area";
import dxTextBox, { InitializedEvent, ValueChangedEvent as TextBoxValueChangedEvent } from "devextreme/ui/text_box";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/inputs/FileQueryTextBox.tsx
Expand Up @@ -26,7 +26,7 @@ import classNames from "classnames";
import Button from "devextreme-react/button";
import TextBox from "devextreme-react/text-box";
import * as React from "react";
import { styled } from "styled-components";
import styled from "styled-components";
import { InitializedEvent, KeyDownEvent } from "devextreme/ui/text_box";
import { useLocalize } from "../../../i18n";
import { selectFileToOpen, selectFileToSave } from "../../../utilities/app/Files";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/popups/AboutPopup.tsx
Expand Up @@ -26,7 +26,7 @@ import * as React from "react";
import { Button, Popup, ScrollView } from "devextreme-react";
import classNames from "classnames";
import { getName, getVersion } from "@tauri-apps/api/app";
import { styled } from "styled-components";
import styled from "styled-components";
import { useLocalize } from "../../../i18n";
import { CommonProps } from "../../Types";
import { GithubLogo, LogoImage } from "../../../utilities/app/Images";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/popups/ConfirmPopup.tsx
Expand Up @@ -25,7 +25,7 @@ SOFTWARE.
import * as React from "react";
import { Button, Popup } from "devextreme-react";
import classNames from "classnames";
import { styled } from "styled-components";
import styled from "styled-components";
import { DialogButtons, DialogResult, PopupType } from "../../../types/Enums";
import { useLocalize } from "../../../i18n";
import { CommonProps } from "../../Types";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/popups/EditCategoryPopup.tsx
Expand Up @@ -26,7 +26,7 @@ import * as React from "react";
import { Button, Popup, TextBox } from "devextreme-react";
import classNames from "classnames";
import { KeyDownEvent, ValueChangedEvent } from "devextreme/ui/text_box";
import { styled } from "styled-components";
import styled from "styled-components";
import { ModifyType } from "../../../types/Enums";
import { useLocalize } from "../../../i18n";
import { DataEntry } from "../../../types/PasswordEntry";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/popups/EditEntryPopup.tsx
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.

import * as React from "react";
import { Button, Popup } from "devextreme-react";
import { styled } from "styled-components";
import styled from "styled-components";
import classNames from "classnames";
import dxTextBox from "devextreme/ui/text_box";
import { ModifyType } from "../../../types/Enums";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/popups/OpenSaveFilePopup.tsx
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.

import * as React from "react";
import { Button, Popup } from "devextreme-react";
import { styled } from "styled-components";
import styled from "styled-components";
import classNames from "classnames";
import { KeyDownEvent, ValueChangedEvent } from "devextreme/ui/text_box";
import { FileQueryMode } from "../../../types/Enums";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/popups/PreferencesPopup.tsx
Expand Up @@ -26,7 +26,7 @@ import * as React from "react";
import { Button, Lookup, NumberBox, Popup } from "devextreme-react";
import classNames from "classnames";
import { ValueChangedEvent } from "devextreme/ui/lookup";
import { styled } from "styled-components";
import styled from "styled-components";
import { Locales, currentLocales, useLocalize } from "../../../i18n";
import { Settings } from "../../../types/Settings";
import { DxThemeNames, dxThemes } from "../../../utilities/ThemeUtils";
Expand Down
2 changes: 1 addition & 1 deletion src/components/software/popups/QueryPasswordPopup.tsx
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.

import * as React from "react";
import { Button, Popup } from "devextreme-react";
import { styled } from "styled-components";
import styled from "styled-components";
import classNames from "classnames";
import { KeyDownEvent, ValueChangedEvent } from "devextreme/ui/text_box";
import { InitializedEvent } from "devextreme/ui/popup";
Expand Down

0 comments on commit 8bb6626

Please sign in to comment.