Skip to content

Commit 74061c5

Browse files
yaodingydyaodingyd
committed
fix pretty cmd
1 parent 9d91b0f commit 74061c5

File tree

6 files changed

+84
-55
lines changed

6 files changed

+84
-55
lines changed

‎examples/App.tsx‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import Flickity from '../src/index'
2-
import './App.css'
3-
import React from 'react'
1+
import Flickity from '../src/index';
2+
import './App.css';
3+
import React from 'react';
44

5-
import Default from './Default'
6-
import Static from './Static'
5+
import Default from './Default';
6+
import Static from './Static';
77

88
function App() {
99
return (
1010
<>
1111
<header>
1212
<nav>
13-
<a href="https://github.com/yaodingyd/react-flickity-component">Github</a>
13+
<a href="https://github.com/yaodingyd/react-flickity-component">
14+
Github
15+
</a>
1416
</nav>
1517
<h1>React-Flickity-Component</h1>
1618
</header>
@@ -20,7 +22,7 @@ function App() {
2022
<Static />
2123
</main>
2224
</>
23-
)
25+
);
2426
}
2527

26-
export default App
28+
export default App;

‎examples/Default.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
import React, { useState } from 'react'
2-
import Flickity from '../src/index'
3-
import { images } from './images'
1+
import React, { useState } from 'react';
2+
import Flickity from '../src/index';
3+
import { images } from './images';
44

55
export default function Default() {
6-
const [imgs, setImages] = useState(images)
6+
const [imgs, setImages] = useState(images);
77

88
function addImage() {
9-
const newImages = [...imgs]
10-
newImages.push('https://picsum.photos/200/300')
11-
setImages(newImages)
9+
const newImages = [...imgs];
10+
newImages.push('https://picsum.photos/200/300');
11+
setImages(newImages);
1212
}
13-
13+
1414
return (
1515
<>
1616
<h3>Default</h3>
17-
<pre>
18-
&lt;Flickity&gt;&#123;children&#125;&lt;&#47;Flickity&gt;
19-
</pre>
17+
<pre>&lt;Flickity&gt;&#123;children&#125;&lt;&#47;Flickity&gt;</pre>
2018
<p className="carousel">
21-
<Flickity >
22-
{imgs.map(image => <img src={image} key={image} className="carousel-image"/>)}
19+
<Flickity>
20+
{imgs.map((image) => (
21+
<img src={image} key={image} className="carousel-image" />
22+
))}
2323
</Flickity>
2424
</p>
2525
<button onClick={addImage}>Add image to carousel</button>
2626
</>
27-
)
28-
}
27+
);
28+
}

‎examples/Static.tsx‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
1-
import React, { useState } from 'react'
2-
import Flickity from '../src/index'
3-
import { images } from './images'
1+
import React, { useState } from 'react';
2+
import Flickity from '../src/index';
3+
import { images } from './images';
44

55
export default function Static() {
6-
const [imgs, setImages] = useState(images)
6+
const [imgs, setImages] = useState(images);
77

88
function addImage() {
9-
const newImages = [...imgs]
10-
newImages.push('https://picsum.photos/200/300')
11-
setImages(newImages)
9+
const newImages = [...imgs];
10+
newImages.push('https://picsum.photos/200/300');
11+
setImages(newImages);
1212
}
13-
13+
1414
return (
1515
<>
1616
<h3>Static</h3>
1717
<pre>
18-
&lt;Flickity static reloadOnUpdate&gt;&#123;children&#125;&lt;&#47;Flickity&gt;
18+
&lt;Flickity static
19+
reloadOnUpdate&gt;&#123;children&#125;&lt;&#47;Flickity&gt;
1920
</pre>
2021
<p className="carousel">
2122
<Flickity static reloadOnUpdate>
22-
{imgs.map(image => <img src={image} key={image} className="carousel-image"/>)}
23+
{imgs.map((image) => (
24+
<img src={image} key={image} className="carousel-image" />
25+
))}
2326
</Flickity>
2427
</p>
2528
<button onClick={addImage}>Add image to carousel</button>
2629
</>
27-
)
28-
}
30+
);
31+
}

‎examples/main.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import React from 'react'
2-
import { createRoot } from 'react-dom/client'
3-
import App from './App'
4-
import './global.css'
1+
import React from 'react';
2+
import { createRoot } from 'react-dom/client';
3+
import App from './App';
4+
import './global.css';
55

6-
const domNode = document.getElementById('root')!
6+
const domNode = document.getElementById('root')!;
77

88
createRoot(domNode).render(
99
<React.StrictMode>
1010
<App />
1111
</React.StrictMode>
12-
)
12+
);

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
},
1717
"scripts": {
18-
"pretty": "prettier --single-quote --trailing-comma es5 --write \"src/**/*.ts\" \"examples/**/*.tsx\"",
18+
"pretty": "prettier --single-quote --trailing-comma es5 --write \"src/**/*.ts[x]\" \"examples/**/*.ts[x]\"",
1919
"test": "vitest",
2020
"dev": "vite serve ./examples",
2121
"build": "vite build",

‎src/index.tsx‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,22 @@ const canUseDOM = !!(
99
window.document.createElement
1010
);
1111

12-
13-
export type FlickityEventName = 'ready' | 'change' | 'select' | 'settle' | 'scroll' | 'dragStart'
14-
| 'dragMove' | 'dragEnd' | 'pointerDown' | 'pointerMove' | 'pointerUp'
15-
| 'staticClick' | 'lazyLoad' | 'bgLazyLoad' | 'fullscreenChange';
16-
12+
export type FlickityEventName =
13+
| 'ready'
14+
| 'change'
15+
| 'select'
16+
| 'settle'
17+
| 'scroll'
18+
| 'dragStart'
19+
| 'dragMove'
20+
| 'dragEnd'
21+
| 'pointerDown'
22+
| 'pointerMove'
23+
| 'pointerUp'
24+
| 'staticClick'
25+
| 'lazyLoad'
26+
| 'bgLazyLoad'
27+
| 'fullscreenChange';
1728

1829
export interface ReactFlickityComponentProps {
1930
className?: string;
@@ -40,7 +51,10 @@ interface FlickityInstance extends Flickity {
4051
activate: () => void;
4152
}
4253

43-
class FlickityComponent extends Component<ReactFlickityComponentProps, FlickityComponentState> {
54+
class FlickityComponent extends Component<
55+
ReactFlickityComponentProps,
56+
FlickityComponentState
57+
> {
4458
static defaultProps: Partial<ReactFlickityComponentProps> = {
4559
className: '',
4660
disableImagesLoaded: false,
@@ -63,14 +77,20 @@ class FlickityComponent extends Component<ReactFlickityComponentProps, FlickityC
6377
};
6478
}
6579

66-
static getDerivedStateFromProps(props: ReactFlickityComponentProps, state: FlickityComponentState) {
80+
static getDerivedStateFromProps(
81+
props: ReactFlickityComponentProps,
82+
state: FlickityComponentState
83+
) {
6784
const cellCount = React.Children.count(props.children);
6885
if (cellCount !== state.cellCount)
6986
return { flickityReady: false, cellCount };
7087
return null;
7188
}
7289

73-
componentDidUpdate(prevProps: ReactFlickityComponentProps, prevState: FlickityComponentState) {
90+
componentDidUpdate(
91+
prevProps: ReactFlickityComponentProps,
92+
prevState: FlickityComponentState
93+
) {
7494
if (!this.flkty) return;
7595
const {
7696
children,
@@ -79,7 +99,7 @@ class FlickityComponent extends Component<ReactFlickityComponentProps, FlickityC
7999
disableImagesLoaded,
80100
} = this.props;
81101
const { flickityReady } = this.state;
82-
102+
83103
if (reloadOnUpdate || (!prevState.flickityReady && flickityReady)) {
84104
const isActive = this.flkty.isActive;
85105
this.flkty.deactivate();
@@ -101,7 +121,6 @@ class FlickityComponent extends Component<ReactFlickityComponentProps, FlickityC
101121
}
102122
}
103123

104-
105124
async componentDidMount() {
106125
if (!canUseDOM || !this.carousel) return;
107126
const FlickityClass = (await import('flickity')).default;
@@ -133,8 +152,13 @@ class FlickityComponent extends Component<ReactFlickityComponentProps, FlickityC
133152
}
134153

135154
render() {
136-
const { elementType = 'div', className = '', static: isStatic, children } = this.props;
137-
155+
const {
156+
elementType = 'div',
157+
className = '',
158+
static: isStatic,
159+
children,
160+
} = this.props;
161+
138162
return React.createElement(
139163
elementType,
140164
{
@@ -148,4 +172,4 @@ class FlickityComponent extends Component<ReactFlickityComponentProps, FlickityC
148172
}
149173
}
150174

151-
export default FlickityComponent;
175+
export default FlickityComponent;

0 commit comments

Comments
 (0)