react-moment 0.7.5 → 0.7.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/.idea/inspectionProfiles/Project_Default.xml +0 -1
  2. package/.idea/typescript-compiler.xml +6 -0
  3. package/.idea/workspace.xml +151 -102
  4. package/README.md +2 -1
  5. package/coverage/clover.xml +95 -94
  6. package/coverage/coverage-final.json +2 -2
  7. package/coverage/lcov-report/index.html +14 -14
  8. package/coverage/lcov-report/index.jsx.html +85 -79
  9. package/coverage/lcov-report/objects.js.html +7 -7
  10. package/coverage/lcov.info +203 -196
  11. package/dist/index.d.ts +62 -24
  12. package/dist/index.js +2 -2
  13. package/package.json +1 -1
  14. package/src/index.jsx +2 -2
  15. package/tests/index.jsx +18 -0
package/coverage/lcov-report/index.jsx.html CHANGED
@@ -20,14 +20,14 @@
20
20
  </h1>
21
21
  <div class='clearfix'>
22
22
  <div class='fl pad1y space-right2'>
23
- <span class="strong">86.96% </span>
23
+ <span class="strong">87.1% </span>
24
24
  <span class="quiet">Statements</span>
25
- <span class='fraction'>80/92</span>
25
+ <span class='fraction'>81/93</span>
26
26
  </div>
27
27
  <div class='fl pad1y space-right2'>
28
- <span class="strong">87.32% </span>
28
+ <span class="strong">88.31% </span>
29
29
  <span class="quiet">Branches</span>
30
- <span class='fraction'>62/71</span>
30
+ <span class='fraction'>68/77</span>
31
31
  </div>
32
32
  <div class='fl pad1y space-right2'>
33
33
  <span class="strong">85.71% </span>
@@ -35,9 +35,9 @@
35
35
  <span class='fraction'>18/21</span>
36
36
  </div>
37
37
  <div class='fl pad1y space-right2'>
38
- <span class="strong">86.96% </span>
38
+ <span class="strong">87.1% </span>
39
39
  <span class="quiet">Lines</span>
40
- <span class='fraction'>80/92</span>
40
+ <span class='fraction'>81/93</span>
41
41
  </div>
42
42
  </div>
43
43
  </div>
@@ -351,7 +351,9 @@
351
351
  306
352
352
  307
353
353
  308
354
- 309</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
354
+ 309
355
+ 310
356
+ 311</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
355
357
  <span class="cline-any cline-neutral">&nbsp;</span>
356
358
  <span class="cline-any cline-neutral">&nbsp;</span>
357
359
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -410,7 +412,8 @@
410
412
  <span class="cline-any cline-neutral">&nbsp;</span>
411
413
  <span class="cline-any cline-neutral">&nbsp;</span>
412
414
  <span class="cline-any cline-neutral">&nbsp;</span>
413
- <span class="cline-any cline-yes">35x</span>
415
+ <span class="cline-any cline-neutral">&nbsp;</span>
416
+ <span class="cline-any cline-yes">37x</span>
414
417
  <span class="cline-any cline-neutral">&nbsp;</span>
415
418
  <span class="cline-any cline-neutral">&nbsp;</span>
416
419
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -485,34 +488,34 @@
485
488
  <span class="cline-any cline-neutral">&nbsp;</span>
486
489
  <span class="cline-any cline-neutral">&nbsp;</span>
487
490
  <span class="cline-any cline-neutral">&nbsp;</span>
488
- <span class="cline-any cline-yes">72x</span>
489
- <span class="cline-any cline-yes">72x</span>
491
+ <span class="cline-any cline-yes">76x</span>
492
+ <span class="cline-any cline-yes">76x</span>
490
493
  <span class="cline-any cline-neutral">&nbsp;</span>
491
- <span class="cline-any cline-yes">72x</span>
492
- <span class="cline-any cline-yes">72x</span>
493
- <span class="cline-any cline-yes">72x</span>
494
- <span class="cline-any cline-yes">72x</span>
494
+ <span class="cline-any cline-yes">76x</span>
495
+ <span class="cline-any cline-yes">76x</span>
496
+ <span class="cline-any cline-yes">76x</span>
497
+ <span class="cline-any cline-yes">76x</span>
495
498
  <span class="cline-any cline-yes">4x</span>
496
499
  <span class="cline-any cline-neutral">&nbsp;</span>
497
- <span class="cline-any cline-yes">68x</span>
500
+ <span class="cline-any cline-yes">72x</span>
498
501
  <span class="cline-any cline-neutral">&nbsp;</span>
499
502
  <span class="cline-any cline-neutral">&nbsp;</span>
500
- <span class="cline-any cline-yes">72x</span>
501
- <span class="cline-any cline-yes">72x</span>
503
+ <span class="cline-any cline-yes">76x</span>
504
+ <span class="cline-any cline-yes">76x</span>
502
505
  <span class="cline-any cline-yes">2x</span>
503
- <span class="cline-any cline-yes">70x</span>
506
+ <span class="cline-any cline-yes">74x</span>
504
507
  <span class="cline-any cline-neutral">&nbsp;</span>
505
508
  <span class="cline-any cline-neutral">&nbsp;</span>
506
509
  <span class="cline-any cline-neutral">&nbsp;</span>
507
510
  <span class="cline-any cline-yes">6x</span>
508
511
  <span class="cline-any cline-neutral">&nbsp;</span>
509
- <span class="cline-any cline-yes">64x</span>
512
+ <span class="cline-any cline-yes">68x</span>
510
513
  <span class="cline-any cline-neutral">&nbsp;</span>
511
- <span class="cline-any cline-yes">72x</span>
514
+ <span class="cline-any cline-yes">76x</span>
512
515
  <span class="cline-any cline-yes">4x</span>
513
516
  <span class="cline-any cline-neutral">&nbsp;</span>
514
517
  <span class="cline-any cline-neutral">&nbsp;</span>
515
- <span class="cline-any cline-yes">72x</span>
518
+ <span class="cline-any cline-yes">76x</span>
516
519
  <span class="cline-any cline-neutral">&nbsp;</span>
517
520
  <span class="cline-any cline-neutral">&nbsp;</span>
518
521
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -521,29 +524,29 @@
521
524
  <span class="cline-any cline-neutral">&nbsp;</span>
522
525
  <span class="cline-any cline-neutral">&nbsp;</span>
523
526
  <span class="cline-any cline-neutral">&nbsp;</span>
524
- <span class="cline-any cline-yes">35x</span>
525
- <span class="cline-any cline-yes">35x</span>
527
+ <span class="cline-any cline-yes">37x</span>
528
+ <span class="cline-any cline-yes">37x</span>
526
529
  <span class="cline-any cline-yes">1x</span>
527
530
  <span class="cline-any cline-neutral">&nbsp;</span>
528
- <span class="cline-any cline-yes">35x</span>
531
+ <span class="cline-any cline-yes">37x</span>
529
532
  <span class="cline-any cline-neutral">&nbsp;</span>
530
533
  <span class="cline-any cline-neutral">&nbsp;</span>
531
- <span class="cline-any cline-yes">35x</span>
534
+ <span class="cline-any cline-yes">37x</span>
532
535
  <span class="cline-any cline-neutral">&nbsp;</span>
533
536
  <span class="cline-any cline-neutral">&nbsp;</span>
534
537
  <span class="cline-any cline-neutral">&nbsp;</span>
535
538
  <span class="cline-any cline-neutral">&nbsp;</span>
536
539
  <span class="cline-any cline-neutral">&nbsp;</span>
537
540
  <span class="cline-any cline-neutral">&nbsp;</span>
538
- <span class="cline-any cline-yes">35x</span>
541
+ <span class="cline-any cline-yes">37x</span>
539
542
  <span class="cline-any cline-neutral">&nbsp;</span>
540
543
  <span class="cline-any cline-neutral">&nbsp;</span>
541
544
  <span class="cline-any cline-neutral">&nbsp;</span>
542
545
  <span class="cline-any cline-neutral">&nbsp;</span>
543
546
  <span class="cline-any cline-neutral">&nbsp;</span>
544
547
  <span class="cline-any cline-neutral">&nbsp;</span>
545
- <span class="cline-any cline-yes">35x</span>
546
- <span class="cline-any cline-yes">35x</span>
548
+ <span class="cline-any cline-yes">37x</span>
549
+ <span class="cline-any cline-yes">37x</span>
547
550
  <span class="cline-any cline-yes">3x</span>
548
551
  <span class="cline-any cline-neutral">&nbsp;</span>
549
552
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -579,10 +582,10 @@
579
582
  <span class="cline-any cline-neutral">&nbsp;</span>
580
583
  <span class="cline-any cline-neutral">&nbsp;</span>
581
584
  <span class="cline-any cline-neutral">&nbsp;</span>
582
- <span class="cline-any cline-yes">35x</span>
583
- <span class="cline-any cline-yes">35x</span>
584
- <span class="cline-any cline-yes">35x</span>
585
- <span class="cline-any cline-yes">32x</span>
585
+ <span class="cline-any cline-yes">37x</span>
586
+ <span class="cline-any cline-yes">37x</span>
587
+ <span class="cline-any cline-yes">37x</span>
588
+ <span class="cline-any cline-yes">34x</span>
586
589
  <span class="cline-any cline-no">&nbsp;</span>
587
590
  <span class="cline-any cline-neutral">&nbsp;</span>
588
591
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -592,11 +595,11 @@
592
595
  <span class="cline-any cline-neutral">&nbsp;</span>
593
596
  <span class="cline-any cline-neutral">&nbsp;</span>
594
597
  <span class="cline-any cline-neutral">&nbsp;</span>
595
- <span class="cline-any cline-yes">36x</span>
598
+ <span class="cline-any cline-yes">38x</span>
596
599
  <span class="cline-any cline-no">&nbsp;</span>
597
600
  <span class="cline-any cline-no">&nbsp;</span>
598
601
  <span class="cline-any cline-neutral">&nbsp;</span>
599
- <span class="cline-any cline-yes">36x</span>
602
+ <span class="cline-any cline-yes">38x</span>
600
603
  <span class="cline-any cline-yes">4x</span>
601
604
  <span class="cline-any cline-neutral">&nbsp;</span>
602
605
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -605,30 +608,31 @@
605
608
  <span class="cline-any cline-neutral">&nbsp;</span>
606
609
  <span class="cline-any cline-neutral">&nbsp;</span>
607
610
  <span class="cline-any cline-neutral">&nbsp;</span>
608
- <span class="cline-any cline-yes">36x</span>
611
+ <span class="cline-any cline-yes">38x</span>
609
612
  <span class="cline-any cline-neutral">&nbsp;</span>
610
613
  <span class="cline-any cline-neutral">&nbsp;</span>
611
614
  <span class="cline-any cline-neutral">&nbsp;</span>
612
- <span class="cline-any cline-yes">36x</span>
615
+ <span class="cline-any cline-yes">38x</span>
613
616
  <span class="cline-any cline-neutral">&nbsp;</span>
614
- <span class="cline-any cline-yes">36x</span>
617
+ <span class="cline-any cline-yes">38x</span>
615
618
  <span class="cline-any cline-neutral">&nbsp;</span>
616
- <span class="cline-any cline-yes">36x</span>
617
- <span class="cline-any cline-yes">36x</span>
618
- <span class="cline-any cline-yes">36x</span>
619
+ <span class="cline-any cline-yes">38x</span>
620
+ <span class="cline-any cline-yes">38x</span>
621
+ <span class="cline-any cline-yes">38x</span>
619
622
  <span class="cline-any cline-yes">1x</span>
620
623
  <span class="cline-any cline-neutral">&nbsp;</span>
621
- <span class="cline-any cline-yes">36x</span>
624
+ <span class="cline-any cline-yes">38x</span>
622
625
  <span class="cline-any cline-yes">1x</span>
623
626
  <span class="cline-any cline-neutral">&nbsp;</span>
624
627
  <span class="cline-any cline-neutral">&nbsp;</span>
625
- <span class="cline-any cline-yes">36x</span>
626
- <span class="cline-any cline-yes">36x</span>
627
- <span class="cline-any cline-yes">3x</span>
628
- <span class="cline-any cline-yes">33x</span>
629
- <span class="cline-any cline-yes">2x</span>
630
- <span class="cline-any cline-yes">31x</span>
628
+ <span class="cline-any cline-yes">38x</span>
629
+ <span class="cline-any cline-yes">38x</span>
630
+ <span class="cline-any cline-yes">38x</span>
631
631
  <span class="cline-any cline-yes">4x</span>
632
+ <span class="cline-any cline-yes">34x</span>
633
+ <span class="cline-any cline-yes">2x</span>
634
+ <span class="cline-any cline-yes">32x</span>
635
+ <span class="cline-any cline-yes">5x</span>
632
636
  <span class="cline-any cline-yes">27x</span>
633
637
  <span class="cline-any cline-yes">2x</span>
634
638
  <span class="cline-any cline-yes">25x</span>
@@ -641,17 +645,17 @@
641
645
  <span class="cline-any cline-yes">17x</span>
642
646
  <span class="cline-any cline-neutral">&nbsp;</span>
643
647
  <span class="cline-any cline-neutral">&nbsp;</span>
644
- <span class="cline-any cline-yes">36x</span>
645
- <span class="cline-any cline-yes">36x</span>
648
+ <span class="cline-any cline-yes">38x</span>
649
+ <span class="cline-any cline-yes">38x</span>
646
650
  <span class="cline-any cline-neutral">&nbsp;</span>
647
- <span class="cline-any cline-yes">36x</span>
648
- <span class="cline-any cline-yes">36x</span>
651
+ <span class="cline-any cline-yes">38x</span>
652
+ <span class="cline-any cline-yes">38x</span>
649
653
  <span class="cline-any cline-neutral">&nbsp;</span>
650
654
  <span class="cline-any cline-neutral">&nbsp;</span>
651
655
  <span class="cline-any cline-neutral">&nbsp;</span>
652
656
  <span class="cline-any cline-neutral">&nbsp;</span>
653
- <span class="cline-any cline-yes">36x</span>
654
- <span class="cline-any cline-yes">36x</span>
657
+ <span class="cline-any cline-yes">38x</span>
658
+ <span class="cline-any cline-yes">38x</span>
655
659
  <span class="cline-any cline-neutral">&nbsp;</span>
656
660
  <span class="cline-any cline-neutral">&nbsp;</span>
657
661
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -683,28 +687,29 @@ const calendarTypes = [
683
687
  &nbsp;
684
688
  export default class Moment extends React.Component {
685
689
  static propTypes = {
686
- element: PropTypes.any,
687
- date: PropTypes.oneOfType(dateTypes),
688
- parse: PropTypes.oneOfType(parseTypes),
689
- format: PropTypes.string,
690
- add: PropTypes.object,
691
- subtract: PropTypes.object,
692
- ago: PropTypes.bool,
693
- fromNow: PropTypes.bool,
694
- from: PropTypes.oneOfType(dateTypes),
695
- toNow: PropTypes.bool,
696
- to: PropTypes.oneOfType(dateTypes),
697
- calendar: PropTypes.oneOfType(calendarTypes),
698
- unix: PropTypes.bool,
699
- utc: PropTypes.bool,
700
- tz: PropTypes.string,
701
- locale: PropTypes.string,
702
- interval: PropTypes.number,
703
- diff: PropTypes.oneOfType(dateTypes),
704
- unit: PropTypes.string,
705
- decimal: PropTypes.bool,
706
- filter: PropTypes.func,
707
- onChange: PropTypes.func
690
+ element: PropTypes.any,
691
+ date: PropTypes.oneOfType(dateTypes),
692
+ parse: PropTypes.oneOfType(parseTypes),
693
+ format: PropTypes.string,
694
+ add: PropTypes.object,
695
+ subtract: PropTypes.object,
696
+ ago: PropTypes.bool,
697
+ fromNow: PropTypes.bool,
698
+ fromNowDuring: PropTypes.number,
699
+ from: PropTypes.oneOfType(dateTypes),
700
+ toNow: PropTypes.bool,
701
+ to: PropTypes.oneOfType(dateTypes),
702
+ calendar: PropTypes.oneOfType(calendarTypes),
703
+ unix: PropTypes.bool,
704
+ utc: PropTypes.bool,
705
+ tz: PropTypes.string,
706
+ locale: PropTypes.string,
707
+ interval: PropTypes.number,
708
+ diff: PropTypes.oneOfType(dateTypes),
709
+ unit: PropTypes.string,
710
+ decimal: PropTypes.bool,
711
+ filter: PropTypes.func,
712
+ onChange: PropTypes.func
708
713
  };
709
714
  &nbsp;
710
715
  static defaultProps = {
@@ -915,7 +920,7 @@ export default class Moment extends React.Component {
915
920
  update(props) {
916
921
  props = props || <span class="branch-1 cbranch-no" title="branch not covered" >this.props;</span>
917
922
  const {
918
- fromNow, from, add, subtract, toNow, to, ago,
923
+ fromNow, fromNowDuring, from, add, subtract, toNow, to, ago,
919
924
  calendar, diff, unit, decimal
920
925
  } = props;
921
926
  &nbsp;
@@ -930,12 +935,13 @@ export default class Moment extends React.Component {
930
935
  datetime.subtract(subtract);
931
936
  }
932
937
  &nbsp;
938
+ const fromNowPeriod = Boolean(fromNowDuring) &amp;&amp; -datetime.diff(moment()) &lt; fromNowDuring;
933
939
  let content = '';
934
- if (format) {
940
+ if (format &amp;&amp; !fromNowPeriod) {
935
941
  content = datetime.format(format);
936
942
  } else if (from) {
937
943
  content = datetime.from(from, ago);
938
- } else if (fromNow) {
944
+ } else if (fromNow || fromNowPeriod) {
939
945
  content = datetime.fromNow(ago);
940
946
  } else if (to) {
941
947
  content = datetime.to(to, ago);
@@ -973,7 +979,7 @@ export default class Moment extends React.Component {
973
979
  </div><!-- /wrapper -->
974
980
  <div class='footer quiet pad2 space-top1 center small'>
975
981
  Code coverage
976
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Thu Jun 14 2018 08:20:35 GMT-0400 (EDT)
982
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jun 20 2018 19:58:56 GMT-0400 (EDT)
977
983
  </div>
978
984
  </div>
979
985
  <script src="prettify.js"></script>
package/coverage/lcov-report/objects.js.html CHANGED
@@ -103,13 +103,13 @@
103
103
  <span class="cline-any cline-neutral">&nbsp;</span>
104
104
  <span class="cline-any cline-neutral">&nbsp;</span>
105
105
  <span class="cline-any cline-neutral">&nbsp;</span>
106
- <span class="cline-any cline-yes">37x</span>
107
- <span class="cline-any cline-yes">37x</span>
108
- <span class="cline-any cline-yes">37x</span>
109
- <span class="cline-any cline-yes">486x</span>
110
- <span class="cline-any cline-yes">454x</span>
106
+ <span class="cline-any cline-yes">39x</span>
107
+ <span class="cline-any cline-yes">39x</span>
108
+ <span class="cline-any cline-yes">39x</span>
109
+ <span class="cline-any cline-yes">516x</span>
110
+ <span class="cline-any cline-yes">482x</span>
111
111
  <span class="cline-any cline-neutral">&nbsp;</span>
112
- <span class="cline-any cline-yes">37x</span>
112
+ <span class="cline-any cline-yes">39x</span>
113
113
  <span class="cline-any cline-neutral">&nbsp;</span>
114
114
  <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">/**
115
115
  * Performs a key comparison between two objects, deleting from the first where
@@ -151,7 +151,7 @@ export function objectKeyFilter(obj1, obj2) {
151
151
  </div><!-- /wrapper -->
152
152
  <div class='footer quiet pad2 space-top1 center small'>
153
153
  Code coverage
154
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Thu Jun 14 2018 08:20:35 GMT-0400 (EDT)
154
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jun 20 2018 19:58:56 GMT-0400 (EDT)
155
155
  </div>
156
156
  </div>
157
157
  <script src="prettify.js"></script>