Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee30b14cba | ||
|
|
80c00149d2 | ||
|
|
a2a48771e1 | ||
|
|
7bd6cf2466 |
38
dist/bookmarklet.js
vendored
38
dist/bookmarklet.js
vendored
File diff suppressed because one or more lines are too long
38
dist/chatbox.js
vendored
38
dist/chatbox.js
vendored
File diff suppressed because one or more lines are too long
44
dist/component.js
vendored
44
dist/component.js
vendored
File diff suppressed because one or more lines are too long
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "private-safesupport-chatbox",
|
"name": "private-safesupport-chatbox",
|
||||||
"version": "2.1.0",
|
"version": "2.1.2",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
10
package.json
10
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "private-safesupport-chatbox",
|
"name": "private-safesupport-chatbox",
|
||||||
"version": "2.1.0",
|
"version": "2.1.2",
|
||||||
"description": "A secure and private embeddable chatbox that connects to Riot",
|
"description": "A secure and private embeddable chatbox that connects to Riot",
|
||||||
"main": "dist/chatbox.js",
|
"main": "dist/chatbox.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -118,6 +118,8 @@
|
|||||||
"node-sass": "^4.13.1",
|
"node-sass": "^4.13.1",
|
||||||
"postcss-increase-specificity": "0.6.0",
|
"postcss-increase-specificity": "0.6.0",
|
||||||
"postcss-loader": "3.0.0",
|
"postcss-loader": "3.0.0",
|
||||||
|
"react": "^16.8.6",
|
||||||
|
"react-dom": "^16.8.6",
|
||||||
"sass-loader": "8.0.0",
|
"sass-loader": "8.0.0",
|
||||||
"style-loader": "1.1.2",
|
"style-loader": "1.1.2",
|
||||||
"wait-for-expect": "^3.0.2",
|
"wait-for-expect": "^3.0.2",
|
||||||
@@ -137,11 +139,13 @@
|
|||||||
"node-localstorage": "^2.1.5",
|
"node-localstorage": "^2.1.5",
|
||||||
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
|
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
"react": "^16.8.6",
|
|
||||||
"react-dom": "^16.8.6",
|
|
||||||
"react-onclickoutside": "^6.9.0",
|
"react-onclickoutside": "^6.9.0",
|
||||||
"react-test-renderer": "^16.13.0",
|
"react-test-renderer": "^16.13.0",
|
||||||
"react-transition-group": "^4.0.0",
|
"react-transition-group": "^4.0.0",
|
||||||
"uuidv4": "^6.0.2"
|
"uuidv4": "^6.0.2"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": "^16.8.6",
|
||||||
|
"react-dom": "^16.8.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ const DEFAULT_POSITION = 'bottom right'
|
|||||||
const DEFAULT_SIZE = 'large'
|
const DEFAULT_SIZE = 'large'
|
||||||
const DEFAULT_MAX_WAIT_MS = 600000 // 10 minutes
|
const DEFAULT_MAX_WAIT_MS = 600000 // 10 minutes
|
||||||
const DEFAULT_WAIT_INTERVAL_MS = 120000 // 2 minutes
|
const DEFAULT_WAIT_INTERVAL_MS = 120000 // 2 minutes
|
||||||
|
const DEFAULT_DOCK_LABEL = 'Start a new chat'
|
||||||
|
|
||||||
class ChatBox extends React.Component {
|
class ChatBox extends React.Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
@@ -756,7 +756,7 @@ class ChatBox extends React.Component {
|
|||||||
)}
|
)}
|
||||||
}
|
}
|
||||||
</Transition>
|
</Transition>
|
||||||
{showDock && !roomId && <Dock handleToggleOpen={this.handleToggleOpen} size={this.props.size} />}
|
{showDock && !roomId && <Dock handleToggleOpen={this.handleToggleOpen} size={this.props.size} label={this.props.dockLabel} />}
|
||||||
{showDock && roomId && <Header handleToggleOpen={this.handleToggleOpen} opened={opened} handleExitChat={this.handleExitChat} />}
|
{showDock && roomId && <Header handleToggleOpen={this.handleToggleOpen} opened={opened} handleExitChat={this.handleExitChat} />}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -782,6 +782,7 @@ ChatBox.propTypes = {
|
|||||||
size: PropTypes.oneOf(['small', 'large']),
|
size: PropTypes.oneOf(['small', 'large']),
|
||||||
maxWaitTime: PropTypes.number,
|
maxWaitTime: PropTypes.number,
|
||||||
waitInterval: PropTypes.number,
|
waitInterval: PropTypes.number,
|
||||||
|
dockLabel: PropTypes.string,
|
||||||
}
|
}
|
||||||
|
|
||||||
ChatBox.defaultProps = {
|
ChatBox.defaultProps = {
|
||||||
@@ -802,6 +803,7 @@ ChatBox.defaultProps = {
|
|||||||
size: DEFAULT_SIZE,
|
size: DEFAULT_SIZE,
|
||||||
maxWaitTime: DEFAULT_MAX_WAIT_MS,
|
maxWaitTime: DEFAULT_MAX_WAIT_MS,
|
||||||
waitInterval: DEFAULT_WAIT_INTERVAL_MS,
|
waitInterval: DEFAULT_WAIT_INTERVAL_MS,
|
||||||
|
dockLabel: DEFAULT_DOCK_LABEL,
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ChatBox;
|
export default ChatBox;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React, { Fragment } from "react"
|
import React, { Fragment } from "react"
|
||||||
import PropTypes from "prop-types"
|
import PropTypes from "prop-types"
|
||||||
|
|
||||||
const Dock = ({ handleToggleOpen, size }) => {
|
const Dock = ({ handleToggleOpen, size, label }) => {
|
||||||
return(
|
return(
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -13,11 +13,11 @@ const Dock = ({ handleToggleOpen, size }) => {
|
|||||||
{
|
{
|
||||||
size === 'small' ?
|
size === 'small' ?
|
||||||
<div id="open-chatbox-label">
|
<div id="open-chatbox-label">
|
||||||
<span>Chat</span><span className="icon">+</span>
|
<span>{label}</span><span className="icon">+</span>
|
||||||
</div>
|
</div>
|
||||||
:
|
:
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<div id="open-chatbox-label">Start a new chat</div>
|
<div id="open-chatbox-label">{label}</div>
|
||||||
<div className="label-icon">
|
<div className="label-icon">
|
||||||
<div className={`btn-icon`} aria-label={`Open support chat window`}>+</div>
|
<div className={`btn-icon`} aria-label={`Open support chat window`}>+</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -105,4 +105,18 @@ module.exports = [{
|
|||||||
libraryExport: 'default',
|
libraryExport: 'default',
|
||||||
libraryTarget: 'commonjs2',
|
libraryTarget: 'commonjs2',
|
||||||
},
|
},
|
||||||
|
externals: {
|
||||||
|
react: {
|
||||||
|
commonjs: "react",
|
||||||
|
commonjs2: "react",
|
||||||
|
amd: "React",
|
||||||
|
root: "React"
|
||||||
|
},
|
||||||
|
"react-dom": {
|
||||||
|
commonjs: "react-dom",
|
||||||
|
commonjs2: "react-dom",
|
||||||
|
amd: "ReactDOM",
|
||||||
|
root: "ReactDOM"
|
||||||
|
}
|
||||||
|
}
|
||||||
}];
|
}];
|
||||||
|
|||||||
Reference in New Issue
Block a user