Skip to content

Commit 4ea2db6

Browse files
authored
Use UI Icon ListGripper (#2908)
Upgrade out UI Icon dependency so we get ListGripper Use UI Icon ListGripper in ListView
1 parent 99c137a commit 4ea2db6

File tree

8 files changed

+24
-45
lines changed

8 files changed

+24
-45
lines changed

packages/@adobe/spectrum-css-temp/components/icon/ui-icons.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ OF ANY KIND, either express or implied. See the License for the specific languag
1010
governing permissions and limitations under the License.
1111
*/
1212

13+
:root {
14+
--spectrum-icon-listgripper-width: var(--spectrum-global-dimension-size-75);
15+
--spectrum-icon-listgripper-height: var(--spectrum-global-dimension-size-150);
16+
}
17+
1318
/* Hide UI icons on older browsers with SVG 1.1 implementations */
1419
.spectrum--medium {
1520
.spectrum-UIIcon--large {
@@ -151,6 +156,10 @@ governing permissions and limitations under the License.
151156
inline-size: var(--spectrum-icon-info-small-width);
152157
block-size: var(--spectrum-icon-info-small-height);
153158
}
159+
.spectrum-UIIcon-ListGripper {
160+
inline-size: var(--spectrum-icon-listgripper-width);
161+
block-size: var(--spectrum-icon-listgripper-height);
162+
}
154163
.spectrum-UIIcon-Magnifier {
155164
inline-size: var(--spectrum-icon-magnifier-width);
156165
block-size: var(--spectrum-icon-magnifier-height);

packages/@react-spectrum/list/src/DragHandle.tsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

packages/@react-spectrum/list/src/ListView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import {Checkbox} from '@react-spectrum/checkbox';
2424
import {classNames, SlotProvider, useDOMRef, useStyleProps} from '@react-spectrum/utils';
2525
import {Content} from '@react-spectrum/view';
2626
import type {DraggableCollectionState} from '@react-stately/dnd';
27-
import DragHandle from './DragHandle';
2827
import {DragHooks} from '@react-spectrum/dnd';
2928
import {GridCollection, GridState, useGridState} from '@react-stately/grid';
3029
import {GridKeyboardDelegate, useGrid, useGridSelectionCheckbox} from '@react-aria/grid';
3130
// @ts-ignore
3231
import intlMessages from '../intl/*.json';
32+
import ListGripper from '@spectrum-icons/ui/src/ListGripper';
3333
import {ListLayout} from '@react-stately/layout';
3434
import {ListState, useListState} from '@react-stately/list';
3535
import listStyles from './listview.css';
@@ -176,7 +176,7 @@ function ListView<T extends object>(props: ListViewProps<T>, ref: DOMRef<HTMLDiv
176176
<div className={listStyles['react-spectrum-ListViewItem-grid']}>
177177
<div className={listStyles['react-spectrum-ListViewItem-draghandle-container']}>
178178
<div className={listStyles['react-spectrum-ListViewItem-draghandle-button']}>
179-
<DragHandle />
179+
<ListGripper />
180180
</div>
181181
</div>
182182
{showCheckbox &&

packages/@react-spectrum/list/src/ListViewItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
1515
import {classNames, ClearSlots, SlotProvider} from '@react-spectrum/utils';
1616
import {Content} from '@react-spectrum/view';
1717
import type {DraggableItemResult} from '@react-aria/dnd';
18-
import DragHandle from './DragHandle';
1918
import {FocusRing, useFocusRing} from '@react-aria/focus';
2019
import {Grid} from '@react-spectrum/layout';
20+
import ListGripper from '@spectrum-icons/ui/src/ListGripper';
2121
import listStyles from './listview.css';
2222
import {ListViewContext} from './ListView';
2323
import {mergeProps} from '@react-aria/utils';
@@ -136,7 +136,7 @@ export function ListViewItem(props) {
136136
style={!showDragHandle ? {...visuallyHiddenProps.style} : {}}
137137
ref={dragButtonRef}
138138
draggable="true">
139-
<DragHandle />
139+
<ListGripper />
140140
</div>
141141
</FocusRing>
142142
}

packages/@react-spectrum/list/src/listview.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,14 @@
118118
grid-area: draghandle;
119119
width: var(--spectrum-global-dimension-size-250);
120120
display: flex;
121-
align-items: center;
122-
justify-items: center;
121+
align-self: stretch;
122+
justify-self: stretch;
123+
justify-content: center;
124+
padding: var(--spectrum-global-dimension-size-25);
123125

124126

125127
.react-spectrum-ListViewItem-draghandle-button {
126-
margin: auto var(--spectrum-global-dimension-size-25);
128+
width: var(--spectrum-global-dimension-size-200);
127129
display: flex;
128130
align-items: center;
129131
justify-content: center;

packages/@spectrum-icons/illustrations/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
"scripts": {
1111
"build-icons": "cross-env BUILD_ENV=production babel --root-mode upward src -d . --extensions '.ts,.tsx' && tsc --project ./tsconfig.types.json"
1212
},
13-
"dependencies": {
14-
"@adobe/react-spectrum-ui": "^1.0.0"
15-
},
13+
"dependencies": {},
1614
"devDependencies": {
1715
"@spectrum-icons/build-tools": "3.0.0-alpha.1"
1816
},

packages/@spectrum-icons/ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"make-icons": "babel-node --presets @babel/env ./scripts/generateIcons.js -i '[]' && tsc --project ./tsconfig.types.json"
1313
},
1414
"dependencies": {
15-
"@adobe/react-spectrum-ui": "^1.0.0",
15+
"@adobe/react-spectrum-ui": "^1.1.0",
1616
"@react-spectrum/icon": "^3.3.4"
1717
},
1818
"devDependencies": {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
dependencies:
3333
tunnel "0.0.6"
3434

35-
"@adobe/react-spectrum-ui@^1.0.0":
36-
version "1.0.1"
37-
resolved "https://registry.yarnpkg.com/@adobe/react-spectrum-ui/-/react-spectrum-ui-1.0.1.tgz#5fe405d55534e06d3bf060f86a79935cda5f6615"
38-
integrity sha512-3RSX2hVWo4n7eUAkYBJmEySc5yfyWXLpQLiSKcOSGIXseD/1aUlPQxcYTdgj8gpRmJH7QghmoHeCjRviRfPXyg==
35+
"@adobe/react-spectrum-ui@^1.1.0":
36+
version "1.1.0"
37+
resolved "https://registry.yarnpkg.com/@adobe/react-spectrum-ui/-/react-spectrum-ui-1.1.0.tgz#6ab31697e29be80a5f04088be1eb8f2a65d9ce54"
38+
integrity sha512-r8+Kl0OJQJOI0tuuQh+/m66OSbDTbfDcuc0e+wtxCLiyi3iEXHWxWkc1TPFBHq9WPX+ALAykJxmlqLtYypP78g==
3939

4040
"@adobe/react-spectrum-workflow-color@^1.0.0":
4141
version "1.0.1"

0 commit comments

Comments
 (0)