Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,39 @@
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@heroicons/react": "1.0.6",
"@hookform/resolvers": "^3.10.0",
"@sentry/react": "^9.22.0",
"@sentry/react": "^9.38.0",
"@sentry/vite-plugin": "^3.5.0",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-query": "^4.40.1",
"date-fns": "^2.30.0",
"javascript-time-ago": "^2.5.11",
"lodash": "^4.17.21",
"polished": "^4.3.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-flatpickr": "^3.10.13",
"react-hook-form": "^7.55.0",
"react-hook-form": "^7.60.0",
"react-is": "^18.3.1",
"react-router-dom": "^6.30.0",
"react-router-dom": "^6.30.1",
"react-time-ago": "^7.3.3",
"showdown": "^2.1.0",
"styled-components": "^6.1.15",
"styled-components": "^6.1.19",
"ts-pattern": "^4.3.0",
"turndown": "^7.2.0",
"zod": "^3.24.2"
"zod": "^3.25.76"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@swc/core": "^1.11.21",
"@swc/core": "^1.12.14",
"@swc/helpers": "^0.5.17",
"@swc/jest": "^0.2.37",
"@swc/jest": "^0.2.39",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.3.1",
"@testing-library/user-event": "^14.6.1",
"@types/jest": "^29.5.14",
"@types/lodash": "^4.17.16",
"@types/react": "^18.3.20",
"@types/react-dom": "^18.3.6",
"@types/lodash": "^4.17.20",
"@types/react": "^18.3.23",
"@types/react-dom": "^18.3.7",
"@types/react-flatpickr": "^3.8.11",
"@types/showdown": "^2.0.6",
"@types/testing-library__jest-dom": "^5.14.9",
Expand All @@ -75,7 +75,7 @@
"resize-observer-polyfill": "^1.5.1",
"rollup-plugin-copy": "3.4.0",
"slugify": "^1.6.6",
"ts-jest": "^29.3.2",
"ts-jest": "^29.4.0",
"typescript": "^5.8.3",
"vite": "^6.3.5"
}
Expand Down
1,715 changes: 893 additions & 822 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/components/common/Comment/Comment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import { DPNormalize } from "../Typography";
import type { FC } from "react";
import type { AnyIcon, AvatarProps, ImageAvatarProps } from "@deskpro/deskpro-ui";
import type { Maybe } from "../../../types";
import type { DeskproAppTheme } from "@deskpro/app-sdk";

const TimeAgo = styled(ReactTimeAgo)`
const TimeAgo = styled(ReactTimeAgo)<DeskproAppTheme>`
color: ${({theme}) => theme.colors.grey80};
`;

Expand Down
3 changes: 2 additions & 1 deletion src/components/common/ErrorBlock/ErrorBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import styled from "styled-components";
import { Stack } from "@deskpro/deskpro-ui";
import type { FC, JSX } from "react";
import type { Maybe } from "../../../types";
import type { DeskproAppTheme } from "@deskpro/app-sdk";

type Props = {
text?: Maybe<string|JSX.Element|Array<string|JSX.Element>>,
}

const StyledErrorBlock = styled(Stack)`
const StyledErrorBlock = styled(Stack)<DeskproAppTheme>`
width: 100%;
margin-bottom: 8px;
padding: 4px 6px;
Expand Down
3 changes: 2 additions & 1 deletion src/components/common/Link/Link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ import styled from "styled-components";
import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
import type { FC } from "react";
import type { IconProps, AnyIcon, ThemeColors } from "@deskpro/deskpro-ui";
import type { DeskproAppTheme } from "@deskpro/app-sdk";

export type Props = {
href?: string,
color?: keyof ThemeColors,
size?: IconProps["size"];
};

const Link = styled.a<{ color?: keyof ThemeColors }>`
const Link = styled.a<DeskproAppTheme & { color?: keyof ThemeColors }>`
color: ${({ theme, color = "cyan100" }) => theme.colors[color]};
text-decoration: none;
`;
Expand Down
3 changes: 2 additions & 1 deletion src/components/common/Typography/FieldHint.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import styled from "styled-components";
import { Label1 } from "@deskpro/deskpro-ui";
import type { DeskproAppTheme } from "@deskpro/app-sdk";

const FieldHint = styled(Label1)`
const FieldHint = styled(Label1)<DeskproAppTheme>`
color: ${({ theme }) => theme.colors.grey80};
`;

Expand Down
3 changes: 2 additions & 1 deletion src/components/common/Typography/Invalid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import styled from "styled-components";
import { TSpan } from "@deskpro/deskpro-ui";
import type { TProps } from "@deskpro/deskpro-ui";
import type { FC, PropsWithChildren } from "react";
import type { DeskproAppTheme } from "@deskpro/app-sdk";

type Props = PropsWithChildren<Omit<TProps, "type">> & {
type?: TProps["type"],
};

const InvalidStyled = styled(TSpan)`
const InvalidStyled = styled(TSpan)<DeskproAppTheme>`
color: ${({ theme }) => theme.colors.red100};
`;

Expand Down
3 changes: 2 additions & 1 deletion src/styles.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { DeskproAppTheme } from "@deskpro/app-sdk";
import { css } from "styled-components";

export const dpNormalize = css`
export const dpNormalize = css<DeskproAppTheme>`
p {
white-space: pre-wrap;
overflow: hidden;
Expand Down
Loading