superdesk-ui-framework 3.0.1-beta.17 → 3.0.1-beta.18

package/dist/react/ContentDivider.tsx

@@ -32,11 +32,12 @@ export default class ContentDividerDoc extends React.Component {
                             consectetur adipiscing elit. Nullam quis risus eget urna mollis ornare vel eu leo.
                             Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur
                             purus sit amet fermentum. Nulla vitae elit libero, a pharetra augue.</p>
-                            <ContentDivider type="dotted" />
+                            <ContentDivider type="dotted" margin='x-small' />
                             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus, tellus
                             ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet
                             risus. Donec id elit non mi porta gravida at eget metus. Cras justo odio, dapibus ac
                             facilisis in, egestas eget quam.</p>
+                            <ContentDivider type="dotted" margin='x-small' />
                         </div>
                     </Markup.ReactMarkupPreview>
                     <Markup.ReactMarkupCode>{`
@@ -50,9 +51,11 @@ export default class ContentDividerDoc extends React.Component {
 
                         <p>Donec ullamcorper nulla non metus auctor fringilla...</p>
 
-                        <ContentDivider type="dotted" />
+                        <ContentDivider type="dotted" margin='x-small' />
 
                         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit...</p>
+
+                        <ContentDivider type="dotted" margin='x-small' />
                     `}
                     </Markup.ReactMarkupCode>
                 </Markup.ReactMarkup>
@@ -69,15 +72,15 @@ export default class ContentDividerDoc extends React.Component {
                             Maecenas faucibus mollis interdum. Donec ullamcorper nulla non metus
                             auctor fringilla. Aenean eu leo quam. Pellentesque ornare sem lacinia
                             quam venenatis vestibulum.</p>
-                            <ContentDivider align="left">
-                                Left aligned
+                            <ContentDivider margin='small' align="left">
+                                Left aligned, small margin
                             </ContentDivider>
                             <p>Maecenas sed diam eget risus varius blandit sit amet non magna.
                             Donec id elit non mi porta gravida at eget metus. Cras mattis consectetur
                             purus sit amet fermentum. Etiam porta sem malesuada magna mollis euismod.
                             Cras mattis consectetur purus sit amet fermentum.</p>
                             <ContentDivider align="right" type="dotted">
-                                Right aligned
+                                Right aligned, dotted
                             </ContentDivider>
                             <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
                             Donec id elit non mi porta gravida at eget metus. Praesent commodo cursus magna,
@@ -93,14 +96,14 @@ export default class ContentDividerDoc extends React.Component {
 
                         <p>Maecenas sed diam eget...</p>
 
-                        <ContentDivider align="left">
-                            Left aligned
+                        <ContentDivider margin='small' align="left">
+                            Left aligned, small margin
                         </ContentDivider>
 
                         <p>Maecenas sed diam eget risus...</p>
 
                         <ContentDivider align="right" type="dotted">
-                            Right aligned
+                            Right aligned, dotted
                         </ContentDivider>
 
                         <p>Praesent commodo cursus magna...</p>
@@ -115,9 +118,9 @@ export default class ContentDividerDoc extends React.Component {
                         <p className="docs-page__paragraph">// Basic</p>
                         <div className='docs-page__content-row'>
                             <span>Option one</span>
-                            <ContentDivider orientation="vertical" type="dotted" />
+                            <ContentDivider margin='small' orientation="vertical" type="dotted" />
                             <span>Option two</span>
-                            <ContentDivider orientation="vertical" type="dotted" />
+                            <ContentDivider margin='small' orientation="vertical" type="dotted" />
                             <span>Option three</span>
                         </div>
                         <p className="docs-page__paragraph ">// With text</p>
@@ -129,7 +132,7 @@ export default class ContentDividerDoc extends React.Component {
                                 sit amet. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Aenean lacinia bibendum nulla
                                 sed consectetur. Vivamus sagittis lacus vel augue.
                             </div>
-                            <ContentDivider orientation="vertical">
+                            <ContentDivider orientation="vertical" margin='large'>
                                 or
                             </ContentDivider>
                             <div style={{width:'100%'}}>
@@ -143,9 +146,9 @@ export default class ContentDividerDoc extends React.Component {
                         // Basic
 
                         <span>Option one</span>
-                        <ContentDivider orientation="vertical" type="dotted" />
+                        <ContentDivider margin='small' orientation="vertical" type="dotted" />
                         <span>Option two</span>
-                        <ContentDivider orientation="vertical" type="dotted" />
+                        <ContentDivider margin='small' orientation="vertical" type="dotted" />
                         <span>Option three</span>
 
                         // With text
@@ -154,7 +157,7 @@ export default class ContentDividerDoc extends React.Component {
                             Cras justo odio, dapibus ac facilisis in, egestas eget quam...
                         </div>
 
-                        <ContentDivider orientation="vertical">
+                        <ContentDivider orientation="vertical" margin='large'>
                             or
                         </ContentDivider>
 
@@ -171,6 +174,7 @@ export default class ContentDividerDoc extends React.Component {
                     <Prop name='orientation' isRequired={false} type='horizontal | vertical' default='horizontal' description='Defines if the divider is horizontal or vertical. Default is horizontal.'/>
                     <Prop name='align' isRequired={false} type='center | left | right' default='right' description='Text alignment inside the divider. Should not be used without any text inside the divider. The vertical divider has no alignment options.'/>
                     <Prop name='border' isRequired={false} type='boolean' default='true' description='Removes the border if set to true. Should be generally avoided especially if there is textual content. It can be used to add space between elements if there is no other option.'/>
+                    <Prop name='margin' isRequired={false} type='x-small | small | medium | large | none' default='medium' description='Vertical or horizontal margins (depending on the orientation) of the ContentDivider. Default to medium if not set.'/>
                 </PropsList>
             </section>
         )

package/dist/superdesk-ui.bundle.css

@@ -35139,6 +35139,9 @@ input.sd-inset-search__input {
   padding: 0;
   color: var(--color-text);
   list-style: none;
+  border-bottom: 0;
+  border-left: 0;
+  border-right: 0;
   border-top: 1px var(--sd-colour-line--medium);
   border-style: solid; }
   .sd-content-divider.sd-content-divider--with-text {
@@ -35149,14 +35152,26 @@ input.sd-inset-search__input {
     white-space: nowrap;
     text-align: center;
     border-top: 0;
+    border-bottom: 0;
+    border-left: 0;
+    border-right: 0;
     border-top-color: var(--sd-colour-line--medium);
     border-style: solid; }
   .sd-content-divider.sd-content-divider--horizontal {
     display: flex;
     clear: both;
     width: 100%;
-    min-width: 100%;
-    margin: 2.4rem 0; }
+    min-width: 100%; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--margin-x-small {
+      margin: 0.8rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--margin-small {
+      margin: 1.6rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--margin-medium {
+      margin: 2.4rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--margin-large {
+      margin: 3.2rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--margin-none {
+      margin: 0 0; }
   .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text {
     margin: 1.6rem 0; }
     .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text::before, .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text::after {
@@ -35168,6 +35183,8 @@ input.sd-inset-search__input {
       border-top-color: transparent;
       border-top-color: inherit;
       border-bottom: 0;
+      border-left: 0;
+      border-right: 0;
       transform: translateY(50%);
       border-style: inherit; }
     .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text.sd-content-divider--text-left::before {
@@ -35178,10 +35195,19 @@ input.sd-inset-search__input {
       width: 95%; }
     .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text.sd-content-divider--text-right::after {
       width: 5%; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text.sd-content-divider--margin-x-small {
+      margin: 0.8rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text.sd-content-divider--margin-small {
+      margin: 1.6rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text.sd-content-divider--margin-medium {
+      margin: 2.4rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text.sd-content-divider--margin-large {
+      margin: 3.2rem 0; }
+    .sd-content-divider.sd-content-divider--horizontal.sd-content-divider--with-text.sd-content-divider--margin-none {
+      margin: 0.4rem 0; }
   .sd-content-divider.sd-content-divider--vertical {
     position: relative;
     display: inline-block;
-    margin: 0.4rem 1.2rem;
     vertical-align: middle;
     border-top: 0;
     border-left: 1px var(--sd-colour-line--medium);
@@ -35204,7 +35230,9 @@ input.sd-inset-search__input {
         position: relative;
         height: 50%;
         border-left: 1px var(--sd-colour-line--medium);
+        border-right: 0;
         border-bottom: 0;
+        border-top: 0;
         width: 1px;
         border-style: solid; }
       .sd-content-divider.sd-content-divider--vertical.sd-content-divider--with-text.sd-content-divider--dashed::before, .sd-content-divider.sd-content-divider--vertical.sd-content-divider--with-text.sd-content-divider--dashed::after {
@@ -35212,6 +35240,16 @@ input.sd-inset-search__input {
       .sd-content-divider.sd-content-divider--vertical.sd-content-divider--with-text.sd-content-divider--dotted::before, .sd-content-divider.sd-content-divider--vertical.sd-content-divider--with-text.sd-content-divider--dotted::after {
         border-style: dotted;
         border-color: var(--sd-colour-line--strong); }
+    .sd-content-divider.sd-content-divider--vertical.sd-content-divider--margin-x-small {
+      margin: 0 0.8rem; }
+    .sd-content-divider.sd-content-divider--vertical.sd-content-divider--margin-small {
+      margin: 0 1.6rem; }
+    .sd-content-divider.sd-content-divider--vertical.sd-content-divider--margin-medium {
+      margin: 0 2.4rem; }
+    .sd-content-divider.sd-content-divider--vertical.sd-content-divider--margin-large {
+      margin: 0 3.2rem; }
+    .sd-content-divider.sd-content-divider--vertical.sd-content-divider--margin-none {
+      margin: 0 0; }
   .sd-content-divider.sd-content-divider--dashed {
     border-style: dashed; }
   .sd-content-divider.sd-content-divider--dotted {

package/dist/superdesk-ui.bundle.js

@@ -76369,6 +76369,8 @@ var ContentDivider = /** @class */ (function (_super) {
             _a["sd-content-divider--".concat(this.props.type)] = this.props.type || this.props.type !== undefined,
             _a["sd-content-divider--text-".concat(this.props.align)] = this.props.align || this.props.align !== undefined,
             _a["sd-content-divider--".concat(this.props.orientation)] = this.props.orientation || this.props.orientation !== undefined,
+            _a['sd-content-divider--margin-medium'] = this.props.margin === undefined,
+            _a["sd-content-divider--margin-".concat(this.props.margin)] = this.props.margin || this.props.margin !== undefined,
             _a));
         if (this.props.children) {
             return (React.createElement("div", { className: "sd-content-divider--with-text " + classes, role: "separator" },

package/examples/pages/react/ContentDivider.tsx

@@ -32,11 +32,12 @@ export default class ContentDividerDoc extends React.Component {
                             consectetur adipiscing elit. Nullam quis risus eget urna mollis ornare vel eu leo.
                             Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur
                             purus sit amet fermentum. Nulla vitae elit libero, a pharetra augue.</p>
-                            <ContentDivider type="dotted" />
+                            <ContentDivider type="dotted" margin='x-small' />
                             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus, tellus
                             ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet
                             risus. Donec id elit non mi porta gravida at eget metus. Cras justo odio, dapibus ac
                             facilisis in, egestas eget quam.</p>
+                            <ContentDivider type="dotted" margin='x-small' />
                         </div>
                     </Markup.ReactMarkupPreview>
                     <Markup.ReactMarkupCode>{`
@@ -50,9 +51,11 @@ export default class ContentDividerDoc extends React.Component {
 
                         <p>Donec ullamcorper nulla non metus auctor fringilla...</p>
 
-                        <ContentDivider type="dotted" />
+                        <ContentDivider type="dotted" margin='x-small' />
 
                         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit...</p>
+
+                        <ContentDivider type="dotted" margin='x-small' />
                     `}
                     </Markup.ReactMarkupCode>
                 </Markup.ReactMarkup>
@@ -69,15 +72,15 @@ export default class ContentDividerDoc extends React.Component {
                             Maecenas faucibus mollis interdum. Donec ullamcorper nulla non metus
                             auctor fringilla. Aenean eu leo quam. Pellentesque ornare sem lacinia
                             quam venenatis vestibulum.</p>
-                            <ContentDivider align="left">
-                                Left aligned
+                            <ContentDivider margin='small' align="left">
+                                Left aligned, small margin
                             </ContentDivider>
                             <p>Maecenas sed diam eget risus varius blandit sit amet non magna.
                             Donec id elit non mi porta gravida at eget metus. Cras mattis consectetur
                             purus sit amet fermentum. Etiam porta sem malesuada magna mollis euismod.
                             Cras mattis consectetur purus sit amet fermentum.</p>
                             <ContentDivider align="right" type="dotted">
-                                Right aligned
+                                Right aligned, dotted
                             </ContentDivider>
                             <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
                             Donec id elit non mi porta gravida at eget metus. Praesent commodo cursus magna,
@@ -93,14 +96,14 @@ export default class ContentDividerDoc extends React.Component {
 
                         <p>Maecenas sed diam eget...</p>
 
-                        <ContentDivider align="left">
-                            Left aligned
+                        <ContentDivider margin='small' align="left">
+                            Left aligned, small margin
                         </ContentDivider>
 
                         <p>Maecenas sed diam eget risus...</p>
 
                         <ContentDivider align="right" type="dotted">
-                            Right aligned
+                            Right aligned, dotted
                         </ContentDivider>
 
                         <p>Praesent commodo cursus magna...</p>
@@ -115,9 +118,9 @@ export default class ContentDividerDoc extends React.Component {
                         <p className="docs-page__paragraph">// Basic</p>
                         <div className='docs-page__content-row'>
                             <span>Option one</span>
-                            <ContentDivider orientation="vertical" type="dotted" />
+                            <ContentDivider margin='small' orientation="vertical" type="dotted" />
                             <span>Option two</span>
-                            <ContentDivider orientation="vertical" type="dotted" />
+                            <ContentDivider margin='small' orientation="vertical" type="dotted" />
                             <span>Option three</span>
                         </div>
                         <p className="docs-page__paragraph ">// With text</p>
@@ -129,7 +132,7 @@ export default class ContentDividerDoc extends React.Component {
                                 sit amet. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Aenean lacinia bibendum nulla
                                 sed consectetur. Vivamus sagittis lacus vel augue.
                             </div>
-                            <ContentDivider orientation="vertical">
+                            <ContentDivider orientation="vertical" margin='large'>
                                 or
                             </ContentDivider>
                             <div style={{width:'100%'}}>
@@ -143,9 +146,9 @@ export default class ContentDividerDoc extends React.Component {
                         // Basic
 
                         <span>Option one</span>
-                        <ContentDivider orientation="vertical" type="dotted" />
+                        <ContentDivider margin='small' orientation="vertical" type="dotted" />
                         <span>Option two</span>
-                        <ContentDivider orientation="vertical" type="dotted" />
+                        <ContentDivider margin='small' orientation="vertical" type="dotted" />
                         <span>Option three</span>
 
                         // With text
@@ -154,7 +157,7 @@ export default class ContentDividerDoc extends React.Component {
                             Cras justo odio, dapibus ac facilisis in, egestas eget quam...
                         </div>
 
-                        <ContentDivider orientation="vertical">
+                        <ContentDivider orientation="vertical" margin='large'>
                             or
                         </ContentDivider>
 
@@ -171,6 +174,7 @@ export default class ContentDividerDoc extends React.Component {
                     <Prop name='orientation' isRequired={false} type='horizontal | vertical' default='horizontal' description='Defines if the divider is horizontal or vertical. Default is horizontal.'/>
                     <Prop name='align' isRequired={false} type='center | left | right' default='right' description='Text alignment inside the divider. Should not be used without any text inside the divider. The vertical divider has no alignment options.'/>
                     <Prop name='border' isRequired={false} type='boolean' default='true' description='Removes the border if set to true. Should be generally avoided especially if there is textual content. It can be used to add space between elements if there is no other option.'/>
+                    <Prop name='margin' isRequired={false} type='x-small | small | medium | large | none' default='medium' description='Vertical or horizontal margins (depending on the orientation) of the ContentDivider. Default to medium if not set.'/>
                 </PropsList>
             </section>
         )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superdesk-ui-framework",
-  "version": "3.0.1-beta.17",
+  "version": "3.0.1-beta.18",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",

package/react/components/ContentDivider.d.ts

@@ -4,6 +4,7 @@ interface IProps {
     orientation?: 'horizontal' | 'vertical';
     align?: 'center' | 'left' | 'right';
     border?: boolean;
+    margin?: 'x-small' | 'small' | 'medium' | 'large' | 'none';
     children?: React.ReactNode;
 }
 export declare class ContentDivider extends React.PureComponent<IProps> {

package/react/components/ContentDivider.js

@@ -54,6 +54,8 @@ var ContentDivider = /** @class */ (function (_super) {
             _a["sd-content-divider--".concat(this.props.type)] = this.props.type || this.props.type !== undefined,
             _a["sd-content-divider--text-".concat(this.props.align)] = this.props.align || this.props.align !== undefined,
             _a["sd-content-divider--".concat(this.props.orientation)] = this.props.orientation || this.props.orientation !== undefined,
+            _a['sd-content-divider--margin-medium'] = this.props.margin === undefined,
+            _a["sd-content-divider--margin-".concat(this.props.margin)] = this.props.margin || this.props.margin !== undefined,
             _a));
         if (this.props.children) {
             return (React.createElement("div", { className: "sd-content-divider--with-text " + classes, role: "separator" },

package/yarn-error.log

@@ -0,0 +1,111 @@
+Arguments: 
+  /usr/local/bin/node /usr/local/bin/yarn install
+
+PATH: 
+  /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
+
+Yarn version: 
+  1.21.1
+
+Node version: 
+  12.14.1
+
+Platform: 
+  linux x64
+
+Trace: 
+  Error: getaddrinfo EAI_AGAIN registry.yarnpkg.com
+      at GetAddrInfoReqWrap.onlookup [as oncomplete] (dns.js:60:26)
+
+npm manifest: 
+  {
+    "name": "superdesk-ui-framework",
+    "version": "2.1.11",
+    "license": "AGPL-3.0",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/superdesk/superdesk-ui-framework.git"
+    },
+    "main": "dist/superdesk-ui.bundle.js",
+    "types": "app-typescript/dist/index.d.ts",
+    "contributors": [
+      "Nemanja Pavlovic",
+      "Vladimir Stefanovic",
+      "Darko Tomic",
+      "Aleksandar Jelicic",
+      "Tomas Kikutis"
+    ],
+    "scripts": {
+      "start": "webpack-dev-server --config tasks/webpack.dev.js",
+      "server": "webpack --watch",
+      "build": "webpack && npm run lint && tsc",
+      "lint": "eslint app && tslint -c tslint.json 'app-typescript/**/*.{ts,tsx}'",
+      "prepublishOnly": "npm run build",
+      "prepublish": "patch-package"
+    },
+    "devDependencies": {
+      "@types/classnames": "^2.2.9",
+      "@types/lodash": "4.14.149",
+      "@types/react": "16.8.23",
+      "@types/react-dom": "16.8.0",
+      "@types/react-router-dom": "^5.1.2",
+      "angular": "^1.7.9",
+      "angular-animate": "^1.7.9",
+      "angular-route": "^1.7.9",
+      "babel-core": "^6.26.0",
+      "babel-loader": "^7.1.2",
+      "babel-plugin-transform-object-rest-spread": "^6.26.0",
+      "babel-preset-es2015": "^6.24.1",
+      "babel-preset-react": "^6.24.1",
+      "classnames": "^2.2.5",
+      "clean-webpack-plugin": "^1.0.0",
+      "code-prettify": "^0.1.0",
+      "copy-webpack-plugin": "^4.6.0",
+      "css-loader": "^2.1.1",
+      "eslint": "^4.6.1",
+      "eslint-loader": "^1.9.0",
+      "eslint-plugin-angular": "^3.1.1",
+      "eslint-plugin-react": "^7.3.0",
+      "extract-text-webpack-plugin": "^3.0.2",
+      "file-loader": "^0.11.2",
+      "html-loader": "^0.5.1",
+      "html-webpack-plugin": "^2.30.1",
+      "jquery": "^3.1.1",
+      "jquery-ui": "^1.12.1",
+      "lodash": "4.17.15",
+      "node-sass": "^4.5.3",
+      "patch-package": "6.2.0",
+      "prismjs": "^1.17.1",
+      "prop-types": "^15.6.0",
+      "react": "16.8.6",
+      "react-bootstrap": "^0.31.2",
+      "react-dom": "16.8.6",
+      "react-redux": "^5.0.6",
+      "react-router-dom": "^5.1.2",
+      "redux": "^3.7.2",
+      "redux-form": "^7.0.4",
+      "sass-loader": "^6.0.6",
+      "style-loader": "^0.18.2",
+      "superdesk-code-style": "^1.1.2",
+      "ts-loader": "^6.0.2",
+      "tslint": "^5.18.0",
+      "typescript": "^3.5.1",
+      "url-loader": "^1.1.2",
+      "webpack": "^3.5.5",
+      "webpack-cli": "3.3.10",
+      "webpack-dev-server": "2.11.1",
+      "webpack-merge": "^4.2.1"
+    },
+    "dependencies": {
+      "date-fns": "2.7.0",
+      "popper.js": "1.14.4",
+      "primeicons": "2.0.0",
+      "primereact": "3.3.2"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile