mapped props should not override component props

[macrozone]

currently mapped props will always override any property passed:

        const newProps = {
          ...this.props,
          ...mappedProps
        };

This makes it impossible to override such a property.

Switching it the other way around would make it more flexible:

        const newProps = {
          ...mappedProps
          ...this.props,
        };