Synchronise latest changes

atlassian · Dec 6, 2024 · 005051e · 005051e
1 parent b6d49a6
commit 005051e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 102 deletions.
diff --git a/packages/documentation/examples/pieces/backlog/list-item.tsx b/packages/documentation/examples/pieces/backlog/list-item.tsx
@@ -11,6 +11,7 @@ import { Checkbox } from '@atlaskit/checkbox';
 import { IconTile } from '@atlaskit/icon';
 import Story16Icon from '@atlaskit/icon-object/glyph/story/16';
 import MoreIcon from '@atlaskit/icon/core/migration/show-more-horizontal--more';
+import PriorityMinorIcon from '@atlaskit/icon/core/priority-minor';
 import StoryIcon from '@atlaskit/icon/core/story';
 import Lozenge from '@atlaskit/lozenge';
 import {
@@ -31,7 +32,6 @@ import { token } from '@atlaskit/tokens';
 
 import { useListContext } from './context';
 import { type ItemData } from './data';
-import { MinorPriorityIcon } from './minor-priority-icon';
 
 const listItemContainerStyles = xcss({
 	position: 'relative',
@@ -268,7 +268,7 @@ export function ListItem({ itemData }: { itemData: ItemData }) {
 					<Inline alignBlock="center" space="space.100">
 						<Lozenge>Todo</Lozenge>
 						<Badge>0d</Badge>
-						<MinorPriorityIcon />
+						<PriorityMinorIcon label={''} color={token('color.icon.accent.blue')} />
 						<Avatar size="small" />
 						<Box xcss={actionStyles}>
 							<IconButton icon={MoreIcon} label="more actions" />

diff --git a/packages/documentation/examples/pieces/backlog/minor-priority-icon.tsx b/packages/documentation/examples/pieces/backlog/minor-priority-icon.tsx
diff --git a/packages/documentation/examples/pieces/rdr-subtasks/minor-priority-icon.tsx b/packages/documentation/examples/pieces/rdr-subtasks/minor-priority-icon.tsx
diff --git a/packages/documentation/examples/pieces/subtasks/primitives/subtask-drag-handle.tsx b/packages/documentation/examples/pieces/subtasks/primitives/subtask-drag-handle.tsx
@@ -14,12 +14,11 @@ import DropdownMenu, {
 	DropdownItemGroup,
 } from '@atlaskit/dropdown-menu';
 import FocusRing from '@atlaskit/focus-ring';
+import DragHandleIcon from '@atlaskit/icon/utility/drag-handle';
 import { token } from '@atlaskit/tokens';
 
 import type { DragState } from '../../hooks/use-sortable-field';
 
-import SubtaskDraggableIcon from './subtask-draggable-icon';
-
 const dragHandleStyles = css({
 	border: 'none',
 	padding: 0,
@@ -112,7 +111,7 @@ function SubtaskDragHandleTrigger({
 			>
 				<div css={dragHandleEmulatedSubtaskBackgroundStyles}>
 					<div css={[dragHandleInnerStyles, isSelected && dragHandleInnerSelectedStyles]}>
-						<SubtaskDraggableIcon />
+						<DragHandleIcon label="" />
 					</div>
 				</div>
 			</button>

diff --git a/packages/documentation/examples/pieces/subtasks/primitives/subtask-draggable-icon.tsx b/packages/documentation/examples/pieces/subtasks/primitives/subtask-draggable-icon.tsx
diff --git a/packages/documentation/examples/pieces/subtasks/primitives/subtask-icon.tsx b/packages/documentation/examples/pieces/subtasks/primitives/subtask-icon.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import SubtaskDraggableIcon from './subtask-draggable-icon';
+import DragHandleIcon from '@atlaskit/icon/core/drag-handle';
 
 export function SubtaskObjectIcon() {
 	return (
@@ -58,7 +58,7 @@ export default function SubtaskIcon({ isIconHidden = false }) {
 		>
 			{/* eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766 */}
 			<div style={{ display: 'var(--subtask-drag-handle-icon-display, none)' }}>
-				<SubtaskDraggableIcon />
+				<DragHandleIcon label="" />
 			</div>
 			<SubtaskObjectIcon />
 		</div>