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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.12.2",
"private": true,
"dependencies": {
"@chakra-ui/react": "^2.8.2",
"@diamondlightsource/ui-components": "v2.2.4",
"@chakra-ui/react": "^2.10.9",
"@diamondlightsource/ui-components": "^2.3.0",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1",
"@fullcalendar/core": "^6.1.19",
Expand Down
6 changes: 5 additions & 1 deletion src/components/atlas/Atlas.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ export const Atlas = ({
) : (
<img src={prependApiUrl(`dataGroups/${groupId}/atlas/image`)} alt='Atlas' />
)}
<svg viewBox='0 0 512 512' className='static-png'>
<svg
viewBox='0 0 512 512'
className='static-png'
style={{ width: colours ? "95%" : undefined }}
>
{data.gridSquares &&
data.gridSquares.map((gridSquare, index) => (
<rect
Expand Down
1 change: 1 addition & 0 deletions src/components/clem/ColourChannelDisplay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export const ColourChannelDisplay = ({
src: `${prefix}?colour=${colour}`,
hidden: !enabled,
}))}
fallbackToPng={true}
/>
</Box>
);
Expand Down
3 changes: 3 additions & 0 deletions src/components/visualisation/apngContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ interface ApngView {
export interface ApngContainerProps extends BoxProps {
views: ApngView[];
overlap?: boolean;
fallbackToPng?: boolean;
}

const OVERLAP_PROPS = {
Expand All @@ -44,6 +45,7 @@ const APNGContainer = ({
height = "64vh",
views,
overlap = false,
fallbackToPng,
...props
}: ApngContainerProps) => {
const [frameLength, setFrameLength] = useState<number>();
Expand Down Expand Up @@ -103,6 +105,7 @@ const APNGContainer = ({
frameIndex={frameIndex}
caption={view.caption}
src={view.src}
fallbackToPng={fallbackToPng}
/>
</Box>
))}
Expand Down
13 changes: 10 additions & 3 deletions src/components/visualisation/collectionTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { HStack, Heading, Link } from "@chakra-ui/layout";
import { Tag, TagLeftIcon, TagLabel, TagProps } from "@chakra-ui/tag";
import { Tooltip } from "@chakra-ui/tooltip";
import {
Tooltip,
Tag,
TagLeftIcon,
TagLabel,
TagProps,
HStack,
Heading,
Link,
} from "@chakra-ui/react";
import { MdInfoOutline } from "react-icons/md";

export interface CollectionTitleProps {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/api/client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStandaloneToast } from "@chakra-ui/toast";
import { createStandaloneToast } from "@chakra-ui/react";
import { baseToast } from "@diamondlightsource/ui-components";
const { toast } = createStandaloneToast();

Expand Down
Loading