chore: refactor/remove mixin #133

picodoth · 2018-04-18T13:45:44Z

Handle menu.onKeyDown usage in rc-select

coveralls · 2018-04-18T13:51:17Z

Coverage increased (+1.8%) to 99.666% when pulling d8e200b on rm-mixin into 6eb19f0 on master.

yesmeck · 2018-04-18T13:51:23Z

Remove all createReactClass, use ES class.

afc163 · 2018-04-19T06:27:59Z

src/SubPopupMenu.js

+      return true;
+    });
+    if (!this.props.defaultActiveFirst && activeIndex !== -1) {
+      if (allDisabled(children.slice(activeIndex, len - 1))) {


这两个 if 可以合并。

afc163 · 2018-04-19T06:29:33Z

src/SubPopupMenu.js

+    }
+    const start = (activeIndex + 1) % len;
+    let i = start;
+    for (; ;) {


用 while 是不是清晰一点。

afc163 · 2018-04-19T06:29:40Z

src/SubPopupMenu.js

+        if (i === start) {
+          return null;
+        }
+      } else {


这个 else 是多余的。

不是多余的，如果找到一个有效的child就立马返回啊

afc163 · 2018-04-19T06:31:37Z

src/SubPopupMenu.js

+  if (c) {
+    this.instanceArray[index] = c;
+  }
+}

 const SubPopupMenu = createReactClass({


去掉了 Mixin 就可以用 ES6 class 了。

afc163 · 2018-04-19T06:32:17Z

src/SubPopupMenu.js

+  getStore() {
+    const store = this.props.store;
+
+    return store;


return this.props.store?

picodoth · 2018-04-19T08:25:38Z

@yesmeck @afc163 take another look

yesmeck · 2018-04-19T10:20:44Z

src/MenuItem.jsx

-  },
-});
-
-MenuItem.isMenuItem = 1;


这句应该不用改

不知道之前是不是埋了一个雷，isMenuItem应该放在包裹它的HOC上的，因为这里：
https://github.com/react-component/menu/blob/master/src/util.js#L40
我们都是直接用connectedComponent而不是menuItem

connect 会把静态属性都 copy 一遍的

https://github.com/yesmeck/mini-store/blob/21826aa4bd2493f04bedfc94a2ee6034a72070bd/src/connect.jsx#L91

yesmeck · 2018-04-19T10:21:07Z

src/MenuItemGroup.jsx

-  },
+  constructor(props) {
+    super(props);
+  }


constructor 可以去掉

yesmeck · 2018-04-19T10:23:12Z

tests/__snapshots__/Menu.spec.js.snap

@@ -188,6 +188,7 @@ exports[`Menu render renders inline menu correctly 1`] = `
        class="rc-menu-submenu-arrow"
      />
    </div>
+    <div />


为啥会多个 div 出来

之前subpopubmenu会做一个渲染判断：
https://github.com/react-component/menu/blob/master/src/SubPopupMenu.js#L91
现在这部分逻辑(renderChildren)被提到subMenu了（因为Animation被提取到subMenu了）
https://github.com/react-component/menu/pull/133/files#diff-7f8a02620917aa2ed1113e338915793bR374
children的返回结果是要做Trigger的popup:
https://github.com/react-component/menu/pull/133/files#diff-7f8a02620917aa2ed1113e338915793bL449
popup属性不能为null，所以就返回了一个空div，这个不影响用户看到的渲染结果的

yesmeck · 2018-04-23T07:34:15Z

src/SubPopupMenu.js

+    level: PropTypes.number,
+    mode: PropTypes.oneOf(['horizontal', 'vertical', 'vertical-left', 'vertical-right', 'inline']),
+    triggerSubMenuAction: PropTypes.oneOf(['click', 'hover']),
+    inlineIndent: PropTypes.number,


这个原来有当成 string 用的。

https://github.com/ant-design/ant-design/blob/fa5491a3900f6aeed3c30f0169d16123e85e5b3c/site/theme/template/Content/MainContent.jsx#L233

后面在用的时候是这么用的：
style.paddingLeft = props.inlineIndent * props.level;，不过它会自动类型转化，为了跟已有的code类型兼容，我改成了：
inlineIndent: PropTypes.oneOfType(PropTypes.number, PropTypes.string),

yesmeck · 2018-04-23T07:49:33Z

其他 ok 👍

yesmeck · 2018-04-23T10:28:06Z

分支要删掉。

picodoth · 2018-04-24T06:36:19Z

@jljsj33 #133 (comment) + #133 (comment)

afc163 · 2018-04-27T06:53:11Z

@picodoth 可以发个大版本，然后更新到 antd feature-3.5.0 分支上，提前合上去发现问题。月底 3.5 上更新掉。

picodoth · 2018-04-27T14:08:53Z

@afc163 好的

picodoth · 2018-04-28T06:16:12Z

@afc163 ant-design/ant-design@548d8c9

chore: refactor/remove mixin

9350e59

picodoth requested a review from yesmeck April 18, 2018 13:45

fix: provide onkeydown as a menu method

8529ac3

picodoth force-pushed the rm-mixin branch from f16aec7 to 8529ac3 Compare April 19, 2018 06:14

afc163 reviewed Apr 19, 2018

View reviewed changes

src/SubPopupMenu.js Outdated

}

const start = (activeIndex + 1) % len;

let i = start;

for (; ;) {

Copy link

Member

afc163 Apr 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

用 while 是不是清晰一点。

afc163 reviewed Apr 19, 2018

View reviewed changes

chore: migrate to es6

091f708

picodoth changed the title ~~[WIP]chore: refactor/remove mixin~~ chore: refactor/remove mixin Apr 19, 2018

picodoth force-pushed the rm-mixin branch from c6062c4 to 7cc542f Compare April 19, 2018 08:02

picodoth added 4 commits April 19, 2018 16:24

update mini-store to 1.1.0

9b905cf

chore: migrate examples to es6

6a4fd18

address cr

f64f09f

chore: fix lint

e1d27b9

picodoth force-pushed the rm-mixin branch from 1ccfc29 to e1d27b9 Compare April 19, 2018 08:24

yesmeck reviewed Apr 19, 2018

View reviewed changes

picodoth mentioned this pull request Apr 20, 2018

求助: 打包报错 getDefaultProps is only used on classic React #130

Closed

yesmeck reviewed Apr 23, 2018

View reviewed changes

address more cr

d8e200b

picodoth force-pushed the rm-mixin branch from d3396e9 to d8e200b Compare April 23, 2018 09:43

picodoth merged commit e688ac2 into master Apr 23, 2018

afc163 deleted the rm-mixin branch April 23, 2018 16:16

chore: refactor/remove mixin #133

chore: refactor/remove mixin #133

picodoth commented Apr 18, 2018 •

edited

coveralls commented Apr 18, 2018 •

edited

yesmeck commented Apr 18, 2018

afc163 Apr 19, 2018

afc163 Apr 19, 2018

afc163 Apr 19, 2018

picodoth Apr 19, 2018

afc163 Apr 19, 2018 •

edited

afc163 Apr 19, 2018

picodoth commented Apr 19, 2018

yesmeck Apr 19, 2018

picodoth Apr 20, 2018

yesmeck Apr 23, 2018

yesmeck Apr 19, 2018 •

edited

yesmeck Apr 19, 2018

picodoth Apr 20, 2018 •

edited

yesmeck Apr 23, 2018

yesmeck Apr 23, 2018

picodoth Apr 23, 2018

yesmeck commented Apr 23, 2018

yesmeck commented Apr 23, 2018

picodoth commented Apr 24, 2018

afc163 commented Apr 27, 2018

picodoth commented Apr 27, 2018

picodoth commented Apr 28, 2018

chore: refactor/remove mixin #133

chore: refactor/remove mixin #133

Conversation

picodoth commented Apr 18, 2018 • edited

coveralls commented Apr 18, 2018 • edited

yesmeck commented Apr 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

afc163 Apr 19, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

picodoth commented Apr 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yesmeck Apr 19, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

picodoth Apr 20, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yesmeck commented Apr 23, 2018

yesmeck commented Apr 23, 2018

picodoth commented Apr 24, 2018

afc163 commented Apr 27, 2018

picodoth commented Apr 27, 2018

picodoth commented Apr 28, 2018

picodoth commented Apr 18, 2018 •

edited

coveralls commented Apr 18, 2018 •

edited

afc163 Apr 19, 2018 •

edited

yesmeck Apr 19, 2018 •

edited

picodoth Apr 20, 2018 •

edited