Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added component prop #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added component prop #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions examples/origin/SomeComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux';


class SomeComponent extends Component {
constructor(props) {
super(props);
this.onClick = this.onClick.bind(this);
}

onClick() {
console.log("__onClick__");
}

render() {
console.log("this.props: ", this.props);
return (
<a {...this.props} onClick={this.onClick} className="SomeComponent">
{this.props.children}
</a>
);
}
}

export default SomeComponent;
19 changes: 10 additions & 9 deletions lib/origin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var Origin = function (_Component) {
value: function render() {
var _this2 = this;

var props = (0, _blacklist2.default)(this.props, 'name', 'content', 'place', 'tag', 'delay', 'delayOn', 'dispatch', 'onTimeout', 'onHover', 'onLeave');
var props = (0, _blacklist2.default)(this.props, 'name', 'content', 'place', 'tagName', 'delay', 'delayOn', 'dispatch', 'onTimeout', 'onHover', 'onLeave');

if (!props.onMouseEnter) {
props.onMouseEnter = function (e) {
Expand All @@ -88,22 +88,22 @@ var Origin = function (_Component) {
};
}

var WrappedComponent = this.props.tag;
var WrappedComponent = this.props.component;

if (typeof WrappedComponent == 'function') {
return _react2.default.createElement(
WrappedComponent,
_extends({}, props, { ref: 'wrapper' }),
{ onMouseEnter: props.onMouseEnter, onMouseLeave: props.onMouseLeave, ref: 'wrapper' },
props.children
);
}

return _react2.default.createElement(this.props.tag, _extends({}, props, { ref: 'wrapper'
return _react2.default.createElement(this.props.tagName, _extends({}, props, { ref: 'wrapper'
}));
}
}], [{
key: 'wrapBy',
value: function wrapBy(tag) {
value: function wrapBy(tagName) {
var CustomOrigin = function (_Origin) {
_inherits(CustomOrigin, _Origin);

Expand All @@ -116,13 +116,13 @@ var Origin = function (_Component) {
_createClass(CustomOrigin, null, [{
key: 'displayName',
get: function get() {
return Origin.displayName + '.' + tag;
return Origin.displayName + '.' + tagName;
}
}, {
key: 'defaultProps',
get: function get() {
return _extends({}, Origin.defaultProps, {
tag: tag
tagName: tagName
});
}
}]);
Expand All @@ -144,7 +144,8 @@ var Origin = function (_Component) {
name: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.arrayOf(_propTypes2.default.string)]),
content: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object, _propTypes2.default.arrayOf(_propTypes2.default.object)]),
place: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.arrayOf(_propTypes2.default.string)]),
tag: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.func]),
tagName: _propTypes2.default.string,
component: _propTypes2.default.func,
delay: _propTypes2.default.oneOfType([_propTypes2.default.bool, _propTypes2.default.number, _propTypes2.default.string]),
delayOn: _propTypes2.default.oneOf(['show', 'hide', 'both']),
onTimeout: _propTypes2.default.func,
Expand All @@ -159,7 +160,7 @@ var Origin = function (_Component) {
get: function get() {
return {
delayOn: 'hide',
tag: 'span'
tagName: 'span'
};
}
}]);
Expand Down
22 changes: 10 additions & 12 deletions src/origin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ class Origin extends Component {
PropTypes.string,
PropTypes.arrayOf(PropTypes.string)
]),
tag: PropTypes.oneOfType([
PropTypes.string,
PropTypes.func
]),
tagName: PropTypes.string,
component: PropTypes.func,
delay: PropTypes.oneOfType([
PropTypes.bool,
PropTypes.number,
Expand All @@ -45,20 +43,20 @@ class Origin extends Component {
static get defaultProps() {
return {
delayOn: 'hide',
tag: 'span',
tagName: 'span',
};
}

static wrapBy(tag) {
static wrapBy(tagName) {
class CustomOrigin extends Origin {
static get displayName() {
return `${Origin.displayName}.${tag}`;
return `${Origin.displayName}.${tagName}`;
}

static get defaultProps() {
return {
...Origin.defaultProps,
tag,
tagName,
};
}
}
Expand All @@ -83,7 +81,7 @@ class Origin extends Component {
}

render() {
const props = blacklist(this.props, 'name', 'content', 'place', 'tag', 'delay', 'delayOn', 'dispatch', 'onTimeout', 'onHover', 'onLeave');
const props = blacklist(this.props, 'name', 'content', 'place', 'tagName', 'delay', 'delayOn', 'dispatch', 'onTimeout', 'onHover', 'onLeave');

if (!props.onMouseEnter) {
props.onMouseEnter = e => {
Expand All @@ -107,15 +105,15 @@ class Origin extends Component {
};
}

const WrappedComponent = this.props.tag;
const WrappedComponent = this.props.component;

if (typeof WrappedComponent == 'function') {
return <WrappedComponent {...props} ref='wrapper'>
return <WrappedComponent onMouseEnter={props.onMouseEnter} onMouseLeave={props.onMouseLeave} ref='wrapper'>
{props.children}
</WrappedComponent>
}

return React.createElement(this.props.tag, {
return React.createElement(this.props.tagName, {
...props, ref: 'wrapper'
});
}
Expand Down