Skip to content

Commit a4fe99f

Browse files
AtlassianAFP Repo Bot
authored andcommitted
Synchronise latest changes
1 parent 2f3fd60 commit a4fe99f

16 files changed

Lines changed: 35 additions & 22 deletions

File tree

packages/core/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @atlaskit/pragmatic-drag-and-drop
22

3+
## 1.5.3
4+
5+
### Patch Changes
6+
7+
- [#145191](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/145191)
8+
[`cd21ebedb9a08`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cd21ebedb9a08) -
9+
Internal change to move towards Compiled CSS-in-JS styling.
10+
311
## 1.5.2
412

513
### Patch Changes

packages/core/examples/native/content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useEffect, useRef, useState } from 'react';
88
import { css, jsx } from '@emotion/react';
99
import invariant from 'tiny-invariant';
1010

11-
import { Stack } from '@atlaskit/primitives';
11+
import { Stack } from '@atlaskit/primitives/compiled';
1212
import { token } from '@atlaskit/tokens';
1313

1414
import { draggable } from '../../src/entry-point/element/adapter';

packages/core/examples/post-drop-bug-fix.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { createContext, Fragment, useContext, useEffect, useRef, useState } from
88
import { css, jsx } from '@emotion/react';
99
import invariant from 'tiny-invariant';
1010

11-
import { Stack } from '@atlaskit/primitives';
11+
import { Stack } from '@atlaskit/primitives/compiled';
1212
import { token } from '@atlaskit/tokens';
1313

1414
import {

packages/core/examples/url.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Fragment, useEffect, useRef, useState } from 'react';
88
import { css, jsx } from '@emotion/react';
99
import invariant from 'tiny-invariant';
1010

11-
import { Box, Stack } from '@atlaskit/primitives';
11+
import { Box, Stack } from '@atlaskit/primitives/compiled';
1212
import { token } from '@atlaskit/tokens';
1313

1414
import { combine } from '../src/entry-point/combine';

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@atlaskit/pragmatic-drag-and-drop",
3-
"version": "1.5.2",
3+
"version": "1.5.3",
44
"description": "The core package for Pragmatic drag and drop - enabling fast drag and drop for any experience on any tech stack",
55
"repository": "https://github.com/atlassian/pragmatic-drag-and-drop",
66
"author": "Atlassian Pty Ltd",

packages/documentation/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @atlaskit/pragmatic-drag-and-drop-docs
22

3+
## 1.3.1
4+
5+
### Patch Changes
6+
7+
- [#145191](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/145191)
8+
[`cd21ebedb9a08`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cd21ebedb9a08) -
9+
Internal change to move towards Compiled CSS-in-JS styling.
10+
311
## 1.3.0
412

513
### Minor Changes

packages/documentation/examples/drawing.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
1717
import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
1818
import { disableNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/disable-native-drag-preview';
1919
import { preventUnhandled } from '@atlaskit/pragmatic-drag-and-drop/prevent-unhandled';
20-
import { Inline } from '@atlaskit/primitives';
20+
import { Inline } from '@atlaskit/primitives/compiled';
2121
import { token } from '@atlaskit/tokens';
2222

2323
const containerStyles = css({

packages/documentation/examples/guidelines/action-menu-variants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22

3-
import { Stack } from '@atlaskit/primitives';
3+
import { Stack } from '@atlaskit/primitives/compiled';
44

55
import { EntireEntityIsDraggable } from './entire-entity-is-draggable';
66
import { EntireEntityIsDraggableWithDragHandleButton } from './entire-entity-is-draggable-with-drag-handle-button';

packages/documentation/examples/guidelines/all-drag-handle-variants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22

3-
import { Stack } from '@atlaskit/primitives';
3+
import { Stack } from '@atlaskit/primitives/compiled';
44

55
import { EntireEntityIsDraggable } from './entire-entity-is-draggable';
66
import { HiddenDragHandle } from './hidden-drag-handle';

packages/documentation/examples/pieces/rdr-board/card-stack.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,12 @@ export function CardStack({ children, numCards }: { children: ReactNode; numCard
5757
return (
5858
<div css={containerStyles}>
5959
{numCards >= 3 && <div css={[sharedCardStyles, bottomCardStyles]} />}
60-
6160
{numCards >= 2 && (
6261
<div css={[sharedCardStyles, secondCardStyles]}>
6362
<div css={secondCardInnerStyles} />
6463
</div>
6564
)}
66-
6765
{children}
68-
6966
{numCards >= 2 && (
7067
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
7168
<div style={{ position: 'absolute', top: -8, right: -8 }}>

0 commit comments

Comments
 (0)