Skip to content

Commit

Permalink
Merge pull request #3 from exoRift/dev
Browse files Browse the repository at this point in the history
Prerelease 0.1.2
  • Loading branch information
exoRift authored Aug 22, 2022
2 parents d5a815b + f1a563a commit 309c48c
Show file tree
Hide file tree
Showing 8 changed files with 6,042 additions and 2,909 deletions.
1 change: 1 addition & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
'../src/**/*.stories.@(js|jsx|ts|tsx)'
],
addons: [
'@storybook/addon-postcss',
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-console'
Expand Down
8,916 changes: 6,022 additions & 2,894 deletions package-lock.json

Large diffs are not rendered by default.

17 changes: 6 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-fluent-mobile",
"version": "0.1.1",
"version": "0.1.2",
"description": "A series of React mixin modules that augment the mobile user experience",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand Down Expand Up @@ -35,9 +35,9 @@
"last 1 safari version"
]
},
"engines" : {
"npm" : ">=7.0.0",
"node" : ">=16.0.0"
"engines": {
"npm": ">=7.0.0",
"node": ">=16.0.0"
},
"keywords": [
"react",
Expand All @@ -56,24 +56,19 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@babel/core": "^7.18.6",
"@babel/preset-react": "^7.18.6",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^22.0.1",
"@rollup/plugin-node-resolve": "^13.3.0",
"@storybook/addon-actions": "^6.5.9",
"@storybook/addon-console": "^1.2.3",
"@storybook/addon-essentials": "^6.5.9",
"@storybook/addon-links": "^6.5.9",
"@storybook/builder-webpack4": "^6.5.9",
"@storybook/manager-webpack4": "^6.5.9",
"@storybook/addon-postcss": "^2.0.0",
"@storybook/react": "^6.5.9",
"@storybook/testing-library": "^0.0.13",
"babel-loader": "^8.2.5",
"autoprefixer": "^10.4.8",
"eslint": "^8.19.0",
"eslint-config-react-app": "^7.0.1",
"eslint-config-standard": "^17.0.0",
"postcss": "^8.4.14",
"rollup": "^2.76.0",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-postcss": "^4.0.2"
Expand Down
5 changes: 5 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
plugins: [
require('autoprefixer')
]
}
6 changes: 5 additions & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from '@rollup/plugin-babel'
import commonjs from '@rollup/plugin-commonjs'
import postcss from 'rollup-plugin-postcss'
import autoprefixer from 'autoprefixer'

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

Expand All @@ -30,7 +31,10 @@ export default {
}),
commonjs(),
postcss({
extensions: ['.css']
extract: true,
plugins: [
autoprefixer()
]
})
]
}
2 changes: 1 addition & 1 deletion src/components/SelectionMixin.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class SelectionMixin extends React.Component {
this.manipulator.current.style.pointerEvents = 'none' // Allow range passthrough of manipulation pad
if (touches[1]) this.selectRange.setStart(...this.getCaretPosition(positions[0], positions[1] + (this.originRange.startCoords.height / 2)))
if (touches[0]) this.selectRange.setEnd(...this.getCaretPosition(positions[2], positions[3] + (this.originRange.endCoords.height / 2)))
this.manipulator.current.style.pointerEvents = 'auto'
this.manipulator.current.style.pointerEvents = null

// Safari selection behavior and Android tap selection behavior
if (this.isIOS || selection.isCollapsed) this.reselectForIOS()
Expand Down
2 changes: 1 addition & 1 deletion src/stories/Coalescence.stories.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export default {
}
},
theme: {
options: ['dark', 'light'],
control: {
options: ['dark', 'light'],
type: 'radio'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/styles/Selection.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

.fluent#fluentselectionmanipulator.inactive {
opacity: 0;
pointer-events: none !important;
pointer-events: none;
}
.fluent#fluentselectionmanipulator.active:not(.inactive) {
opacity: 1;
Expand Down

0 comments on commit 309c48c

Please sign in to comment.