Merge branch 'feat/v2-main' of github.com:OHIF/Viewers into feat/ohif-179

This commit is contained in:
igoroctaviano committed 2020-06-30 12:43:19 -03:00
commit d94bc2d5a2
13 files changed
+146 -72

No files matched your search

@@ -9,6 +9,7 @@ import { Icon } from '@ohif/ui';
*
*/
const Thumbnail = ({
displaySetInstanceUID,
className,
imageSrc,
imageAltText,
@@ -36,6 +37,7 @@ const Thumbnail = ({
className,
'flex flex-col flex-1 px-3 mb-8 cursor-pointer outline-none'
)}
id={`thumbnail-${displaySetInstanceUID}`}
onClick={onClick}
onKeyDown={onClick}
role="button"
@@ -33,6 +33,7 @@ const ThumbnailList = ({
return (
<Thumbnail
key={displaySetInstanceUID}
displaySetInstanceUID={displaySetInstanceUID}
dragData={dragData}
description={description}
seriesNumber={seriesNumber}
@@ -48,6 +49,7 @@ const ThumbnailList = ({
return (
<ThumbnailTracked
key={displaySetInstanceUID}
displaySetInstanceUID={displaySetInstanceUID}
dragData={dragData}
description={description}
seriesNumber={seriesNumber}
@@ -65,6 +67,7 @@ const ThumbnailList = ({
return (
<ThumbnailNoImage
key={displaySetInstanceUID}
displaySetInstanceUID={displaySetInstanceUID}
dragData={dragData}
modality={modality}
seriesDate={seriesDate}
@@ -1,10 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { useDrag } from 'react-dnd';
import { Icon } from '@ohif/ui';
const ThumbnailNoImage = ({
displaySetInstanceUID,
description,
seriesDate,
modality,
@@ -21,7 +23,8 @@ const ThumbnailNoImage = ({
return (
<div
ref={drag}
className="flex flex-row flex-1 px-4 py-3 cursor-pointer"
className={'flex flex-row flex-1 px-4 py-3 cursor-pointer'}
id={`thumbnail-${displaySetInstanceUID}`}
onClick={onClick}
onKeyDown={onClick}
role="button"
@@ -5,6 +5,7 @@ import classnames from 'classnames';
import { Icon, Thumbnail, Tooltip } from '@ohif/ui';
const ThumbnailTracked = ({
displaySetInstanceUID,
className,
imageSrc,
imageAltText,
@@ -26,6 +27,7 @@ const ThumbnailTracked = ({
'flex flex-row flex-1 px-3 py-2 cursor-pointer outline-none',
className
)}
id={`thumbnail-${displaySetInstanceUID}`}
>
<div className="flex flex-col items-center flex-2">
<div