Skip to content

Commit 309c48c

Browse files
authored
Merge pull request #3 from exoRift/dev
Prerelease 0.1.2
2 parents d5a815b + f1a563a commit 309c48c

File tree

8 files changed

+6042
-2909
lines changed

8 files changed

+6042
-2909
lines changed

.storybook/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = {
44
'../src/**/*.stories.@(js|jsx|ts|tsx)'
55
],
66
addons: [
7+
'@storybook/addon-postcss',
78
'@storybook/addon-links',
89
'@storybook/addon-essentials',
910
'@storybook/addon-console'

package-lock.json

Lines changed: 6022 additions & 2894 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-fluent-mobile",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"description": "A series of React mixin modules that augment the mobile user experience",
55
"main": "dist/index.js",
66
"module": "dist/index.esm.js",
@@ -35,9 +35,9 @@
3535
"last 1 safari version"
3636
]
3737
},
38-
"engines" : {
39-
"npm" : ">=7.0.0",
40-
"node" : ">=16.0.0"
38+
"engines": {
39+
"npm": ">=7.0.0",
40+
"node": ">=16.0.0"
4141
},
4242
"keywords": [
4343
"react",
@@ -56,24 +56,19 @@
5656
"react-dom": "^18.2.0"
5757
},
5858
"devDependencies": {
59-
"@babel/core": "^7.18.6",
60-
"@babel/preset-react": "^7.18.6",
6159
"@rollup/plugin-babel": "^5.3.1",
6260
"@rollup/plugin-commonjs": "^22.0.1",
6361
"@rollup/plugin-node-resolve": "^13.3.0",
6462
"@storybook/addon-actions": "^6.5.9",
6563
"@storybook/addon-console": "^1.2.3",
6664
"@storybook/addon-essentials": "^6.5.9",
6765
"@storybook/addon-links": "^6.5.9",
68-
"@storybook/builder-webpack4": "^6.5.9",
69-
"@storybook/manager-webpack4": "^6.5.9",
66+
"@storybook/addon-postcss": "^2.0.0",
7067
"@storybook/react": "^6.5.9",
71-
"@storybook/testing-library": "^0.0.13",
72-
"babel-loader": "^8.2.5",
68+
"autoprefixer": "^10.4.8",
7369
"eslint": "^8.19.0",
7470
"eslint-config-react-app": "^7.0.1",
7571
"eslint-config-standard": "^17.0.0",
76-
"postcss": "^8.4.14",
7772
"rollup": "^2.76.0",
7873
"rollup-plugin-peer-deps-external": "^2.2.4",
7974
"rollup-plugin-postcss": "^4.0.2"

postcss.config.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
plugins: [
3+
require('autoprefixer')
4+
]
5+
}

rollup.config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
} from '@rollup/plugin-babel'
66
import commonjs from '@rollup/plugin-commonjs'
77
import postcss from 'rollup-plugin-postcss'
8+
import autoprefixer from 'autoprefixer'
89

910
const packageJson = require('./package.json')
1011

@@ -30,7 +31,10 @@ export default {
3031
}),
3132
commonjs(),
3233
postcss({
33-
extensions: ['.css']
34+
extract: true,
35+
plugins: [
36+
autoprefixer()
37+
]
3438
})
3539
]
3640
}

src/components/SelectionMixin.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ class SelectionMixin extends React.Component {
206206
this.manipulator.current.style.pointerEvents = 'none' // Allow range passthrough of manipulation pad
207207
if (touches[1]) this.selectRange.setStart(...this.getCaretPosition(positions[0], positions[1] + (this.originRange.startCoords.height / 2)))
208208
if (touches[0]) this.selectRange.setEnd(...this.getCaretPosition(positions[2], positions[3] + (this.originRange.endCoords.height / 2)))
209-
this.manipulator.current.style.pointerEvents = 'auto'
209+
this.manipulator.current.style.pointerEvents = null
210210

211211
// Safari selection behavior and Android tap selection behavior
212212
if (this.isIOS || selection.isCollapsed) this.reselectForIOS()

src/stories/Coalescence.stories.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export default {
3434
}
3535
},
3636
theme: {
37+
options: ['dark', 'light'],
3738
control: {
38-
options: ['dark', 'light'],
3939
type: 'radio'
4040
}
4141
}

src/styles/Selection.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
.fluent#fluentselectionmanipulator.inactive {
3030
opacity: 0;
31-
pointer-events: none !important;
31+
pointer-events: none;
3232
}
3333
.fluent#fluentselectionmanipulator.active:not(.inactive) {
3434
opacity: 1;

0 commit comments

Comments
 (0)